Skip to content

GitLab

T
tangled
Commit 631ffe4f authored by avi@chromium.org's avatar avi@chromium.org
Browse files
Options

Tweak title bar; give one more pixel at the top, one extra pixel spacing to... 

Tweak title bar; give one more pixel at the top, one extra pixel spacing to right/left of window widgets.

xib change: tab strip one pixel taller

BUG=70597
TEST=none

Review URL: http://codereview.chromium.org/6280017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72677 0039d316-1c4b-4281-b951-d872f2087c98
parent 99c80b9e
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 32 deletions
chrome/app/nibs/BrowserWindow.xib
View file @ 631ffe4f
...@@ -3,15 +3,16 @@ ...@@ -3,15 +3,16 @@
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10F569</string> <string key="IBDocument.SystemVersion">10F569</string>
<string key="IBDocument.InterfaceBuilderVersion">788</string> <string key="IBDocument.InterfaceBuilderVersion">804</string>
<string key="IBDocument.AppKitVersion">1038.29</string> <string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">461.00</string> <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">788</string> <string key="NS.object.0">804</string>
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="56"/>
<integer value="1"/> <integer value="1"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
...@@ -69,7 +70,7 @@ ...@@ -69,7 +70,7 @@
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object> </object>
<object class="NSCustomView" id="1029219716"> <object class="NSCustomView" id="1029219716">
<nil key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -98,7 +99,8 @@ ...@@ -98,7 +99,8 @@
</object> </object>
</object> </object>
</object> </object>
<string key="NSFrameSize">{483, 36}</string> <string key="NSFrameSize">{483, 37}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">TabStripView</string> <string key="NSClassName">TabStripView</string>
</object> </object>
<object class="NSCustomView" id="529166964"> <object class="NSCustomView" id="529166964">
...@@ -295,7 +297,7 @@ ...@@ -295,7 +297,7 @@
</object> </object>
<real value="0.0"/> <real value="0.0"/>
<real value="0.0"/> <real value="0.0"/>
<string>{{138, 199}, {483, 36}}</string> <string>{{138, 198}, {483, 37}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>NewTabButton</string> <string>NewTabButton</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -417,7 +419,7 @@ ...@@ -417,7 +419,7 @@
<string key="className">NSObject</string> <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string> <string key="majorKey">IBProjectSource</string>
<string key="minorKey">browser/ui/cocoa/tab_strip_model_observer_bridge.h</string> <string key="minorKey">browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
...@@ -451,7 +453,7 @@ ...@@ -451,7 +453,7 @@
<string key="superclassName">TabStripView</string> <string key="superclassName">TabStripView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string> <string key="majorKey">IBProjectSource</string>
<string key="minorKey">browser/ui/cocoa/side_tab_strip_view.h</string> <string key="minorKey">browser/ui/cocoa/tabs/side_tab_strip_view.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
...@@ -470,7 +472,7 @@ ...@@ -470,7 +472,7 @@
</object> </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string> <string key="majorKey">IBProjectSource</string>
<string key="minorKey">browser/ui/cocoa/tab_strip_view.h</string> <string key="minorKey">browser/ui/cocoa/tabs/tab_strip_view.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
...@@ -480,16 +482,12 @@ ...@@ -480,16 +482,12 @@
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>contentsContainer_</string>
<string>devToolsContainer_</string>
<string>sideTabStripView_</string> <string>sideTabStripView_</string>
<string>tabContentArea_</string> <string>tabContentArea_</string>
<string>topTabStripView_</string> <string>topTabStripView_</string>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>NSSplitView</string>
<string>NSSplitView</string>
<string>TabStripView</string> <string>TabStripView</string>
<string>FastResizeView</string> <string>FastResizeView</string>
<string>TabStripView</string> <string>TabStripView</string>
...@@ -499,22 +497,12 @@ ...@@ -499,22 +497,12 @@
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>contentsContainer_</string>
<string>devToolsContainer_</string>
<string>sideTabStripView_</string> <string>sideTabStripView_</string>
<string>tabContentArea_</string> <string>tabContentArea_</string>
<string>topTabStripView_</string> <string>topTabStripView_</string>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">contentsContainer_</string>
<string key="candidateClassName">NSSplitView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">devToolsContainer_</string>
<string key="candidateClassName">NSSplitView</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">sideTabStripView_</string> <string key="name">sideTabStripView_</string>
<string key="candidateClassName">TabStripView</string> <string key="candidateClassName">TabStripView</string>
...@@ -531,7 +519,7 @@ ...@@ -531,7 +519,7 @@
</object> </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string> <string key="majorKey">IBProjectSource</string>
<string key="minorKey">browser/ui/cocoa/tab_window_controller.h</string> <string key="minorKey">browser/ui/cocoa/tabs/tab_window_controller.h</string>
</object> </object>
</object> </object>
</object> </object>
...@@ -812,7 +800,7 @@ ...@@ -812,7 +800,7 @@
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">NSObject</string> <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="996113394"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string> <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string> <string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string>
</object> </object>
...@@ -1140,11 +1128,6 @@ ...@@ -1140,11 +1128,6 @@
<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">NSSplitView</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="996113394"/>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">NSView</string> <string key="className">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
......
chrome/browser/ui/cocoa/framed_browser_window.h
View file @ 631ffe4f
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
// Offsets from the top/left of the window frame to the top of the window // Offsets from the top/left of the window frame to the top of the window
// controls (zoom, close, miniaturize) for a window with a tabstrip. // controls (zoom, close, miniaturize) for a window with a tabstrip.
const NSInteger kFramedWindowButtonsWithTabStripOffsetFromTop = 10; const NSInteger kFramedWindowButtonsWithTabStripOffsetFromTop = 11;
const NSInteger kFramedWindowButtonsWithTabStripOffsetFromLeft = 10; const NSInteger kFramedWindowButtonsWithTabStripOffsetFromLeft = 11;
// Offsets from the top/left of the window frame to the top of the window // Offsets from the top/left of the window frame to the top of the window
// controls (zoom, close, miniaturize) for a window without a tabstrip. // controls (zoom, close, miniaturize) for a window without a tabstrip.
......
chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
View file @ 631ffe4f
...@@ -430,7 +430,7 @@ private: ...@@ -430,7 +430,7 @@ private:
+ (CGFloat)defaultIndentForControls { + (CGFloat)defaultIndentForControls {
// Default indentation leaves enough room so tabs don't overlap with the // Default indentation leaves enough room so tabs don't overlap with the
// window controls. // window controls.
return 68.0; return 70.0;
} }
// Finds the TabContentsController associated with the given index into the tab // Finds the TabContentsController associated with the given index into the tab
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment