diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 23:20:30 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 23:20:30 +0000 |
commit | d284a5fd91186becd0091b35219710735b9cbf74 (patch) | |
tree | 1c7f029d16e5d1c6b0dce45b133d64763a5f3929 /chrome/app/nibs/TabContents.xib | |
parent | e39bc5e7891b2b2bb4bc6f08e4579da4b1d11fb8 (diff) | |
download | chromium_src-d284a5fd91186becd0091b35219710735b9cbf74.zip chromium_src-d284a5fd91186becd0091b35219710735b9cbf74.tar.gz chromium_src-d284a5fd91186becd0091b35219710735b9cbf74.tar.bz2 |
Mac: Make devtools window dockable.
xib change: Deleted NSBox, added NSSplitView instead (with a thin divider and without any child views).
I added the devtools tabcontents to TabContentsController; windows and linux instead add it to the browser window and switch it on every tab change. What I've done makes more sense to me and might work better with a) dragging a tab with docked devtools into a new window and b) toggling fullscreen.
BUG=17368
TEST=
* Inspect element, click the "attach" item in the lower left corner. Devtools should attach to the tab. Click it again, should detach. Re-attach, switch tabs. Should only be in the tab it was attached to. Open another devtools window in another tab, should be attached there. Drag tab with attached devtools into a new window, should work.
* Inspect element with docked devtools, close devtools, inspect another element. devtools should open with the same size it had when it was closed, and should still be docked.
* Hover link with docked devtools. Status bubble should not overlap devtools.
* Go to http://www.pagetutor.com/keeper/http_authentication/index.html and make sure the http auth sheet still shows up
Review URL: http://codereview.chromium.org/526001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs/TabContents.xib')
-rw-r--r-- | chrome/app/nibs/TabContents.xib | 101 |
1 files changed, 28 insertions, 73 deletions
diff --git a/chrome/app/nibs/TabContents.xib b/chrome/app/nibs/TabContents.xib index cf88b9c..2d45690 100644 --- a/chrome/app/nibs/TabContents.xib +++ b/chrome/app/nibs/TabContents.xib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9J61</string> + <string key="IBDocument.SystemVersion">9L31a</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.46</string> + <string key="IBDocument.AppKitVersion">949.54</string> <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="94"/> + <integer value="195"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -55,50 +55,12 @@ <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSBox" id="753762894"> + <object class="NSSplitView" id="89435107"> <reference key="NSNextResponder" ref="675542922"/> - <int key="NSvFlags">18</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="250835567"> - <reference key="NSNextResponder" ref="753762894"/> - <int key="NSvFlags">256</int> - <string key="NSFrameSize">{480, 360}</string> - <reference key="NSSuperview" ref="753762894"/> - </object> - </object> + <int key="NSvFlags">274</int> <string key="NSFrameSize">{480, 360}</string> <reference key="NSSuperview" ref="675542922"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Box</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.100000e+01</double> - <int key="NSfFlags">3100</int> - </object> - <object class="NSColor" key="NSBackgroundColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor" id="524635398"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> - </object> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="250835567"/> - <int key="NSBorderType">0</int> - <int key="NSBoxType">4</int> - <int key="NSTitlePosition">0</int> - <bool key="NSTransparent">NO</bool> - <reference key="NSFillColor2" ref="524635398"/> + <int key="NSDividerStyle">2</int> </object> </object> <string key="NSFrameSize">{480, 360}</string> @@ -122,11 +84,11 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">contentsBox_</string> + <string key="label">contentsContainer_</string> <reference key="source" ref="326691890"/> - <reference key="destination" ref="753762894"/> + <reference key="destination" ref="89435107"/> </object> - <int key="connectionID">169</int> + <int key="connectionID">200</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -167,7 +129,7 @@ <reference key="object" ref="675542922"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="753762894"/> + <reference ref="89435107"/> </object> <reference key="parent" ref="886393115"/> </object> @@ -178,8 +140,8 @@ <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> - <int key="objectID">164</int> - <reference key="object" ref="753762894"/> + <int key="objectID">195</int> + <reference key="object" ref="89435107"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -194,7 +156,7 @@ <string>-1.IBPluginDependency</string> <string>-2.IBPluginDependency</string> <string>-3.IBPluginDependency</string> - <string>164.IBPluginDependency</string> + <string>195.IBPluginDependency</string> <string>93.IBEditorWindowLastContentRect</string> <string>93.IBViewEditorWindowController.showingLayoutRectangles</string> <string>93.IBWindowTemplateEditedContentRect</string> @@ -210,9 +172,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{769, 496}, {480, 360}}</string> + <string>{{283, 496}, {480, 360}}</string> <boolean value="YES" id="5"/> - <string>{{769, 496}, {480, 360}}</string> + <string>{{283, 496}, {480, 360}}</string> <reference ref="5"/> <reference ref="5"/> <string>{480, 360}</string> @@ -240,7 +202,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">194</int> + <int key="maxID">200</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -258,11 +220,10 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">GrowBoxView</string> - <string key="superclassName">NSView</string> + <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/grow_box_view.h</string> + <string key="minorKey">browser/cocoa/status_bubble_mac.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -273,24 +234,18 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/nswindow_local_state.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">TabContentsController</string> <string key="superclassName">NSViewController</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">fullScreen:</string> - <string key="NS.object.0">id</string> - </object> <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>contentsBox_</string> - <string>growBox_</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSBox</string> - <string>GrowBoxView</string> - </object> + <string key="NS.key.0">contentsContainer_</string> + <string key="NS.object.0">NSSplitView</string> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -300,7 +255,7 @@ </object> </object> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.LastKnownRelativeProjectPath">../../../chrome.xcodeproj</string> + <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> </data> </archive> |