summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/nibs/Toolbar.xib24
-rw-r--r--chrome/browser/cocoa/extensions/browser_actions_container_view.mm23
-rw-r--r--chrome/browser/cocoa/extensions/browser_actions_controller.mm13
3 files changed, 44 insertions, 16 deletions
diff --git a/chrome/app/nibs/Toolbar.xib b/chrome/app/nibs/Toolbar.xib
index a7d65cf..9a530c0 100644
--- a/chrome/app/nibs/Toolbar.xib
+++ b/chrome/app/nibs/Toolbar.xib
@@ -42,14 +42,14 @@
<object class="NSCustomView" id="421615633">
<reference key="NSNextResponder" ref="928520650"/>
<int key="NSvFlags">-2147483383</int>
- <string key="NSFrame">{{570, 0}, {1, 36}}</string>
+ <string key="NSFrame">{{573, 0}, {1, 36}}</string>
<reference key="NSSuperview" ref="928520650"/>
<string key="NSClassName">BrowserActionsContainerView</string>
</object>
<object class="NSTextField" id="535508469">
<reference key="NSNextResponder" ref="928520650"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{136, 5}, {435, 27}}</string>
+ <string key="NSFrame">{{136, 5}, {438, 27}}</string>
<reference key="NSSuperview" ref="928520650"/>
<int key="NSTag">33004</int>
<bool key="NSEnabled">YES</bool>
@@ -193,7 +193,7 @@
<object class="NSButton" id="602421009">
<reference key="NSNextResponder" ref="928520650"/>
<int key="NSvFlags">265</int>
- <string key="NSFrame">{{574, 5}, {35, 27}}</string>
+ <string key="NSFrame">{{577, 5}, {35, 27}}</string>
<reference key="NSSuperview" ref="928520650"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="204555298">
@@ -215,7 +215,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{618, 36}</string>
+ <string key="NSFrameSize">{616, 36}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">ToolbarView</string>
</object>
@@ -347,7 +347,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <object class="NSArray" key="object" id="810617569">
+ <object class="NSArray" key="object" id="185296244">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="children" ref="1000"/>
@@ -356,19 +356,19 @@
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="1001"/>
- <reference key="parent" ref="810617569"/>
+ <reference key="parent" ref="185296244"/>
<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="1003"/>
- <reference key="parent" ref="810617569"/>
+ <reference key="parent" ref="185296244"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="1004"/>
- <reference key="parent" ref="810617569"/>
+ <reference key="parent" ref="185296244"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
@@ -384,7 +384,7 @@
<reference ref="602421009"/>
<reference ref="421615633"/>
</object>
- <reference key="parent" ref="810617569"/>
+ <reference key="parent" ref="185296244"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2</int>
@@ -473,12 +473,12 @@
<object class="IBObjectRecord">
<int key="objectID">122</int>
<reference key="object" ref="1044322163"/>
- <reference key="parent" ref="810617569"/>
+ <reference key="parent" ref="185296244"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">130</int>
<reference key="object" ref="306232897"/>
- <reference key="parent" ref="810617569"/>
+ <reference key="parent" ref="185296244"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">144</int>
@@ -534,7 +534,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{370, 714}, {618, 36}}</string>
+ <string>{{370, 714}, {616, 36}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>ClickHoldButtonCell</string>
diff --git a/chrome/browser/cocoa/extensions/browser_actions_container_view.mm b/chrome/browser/cocoa/extensions/browser_actions_container_view.mm
index 4fa7b15a..d0518c6 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_container_view.mm
+++ b/chrome/browser/cocoa/extensions/browser_actions_container_view.mm
@@ -19,7 +19,12 @@ NSString* const kBrowserActionGrippyDragFinishedNotification =
namespace {
const CGFloat kAnimationDuration = 0.2;
const CGFloat kGrippyWidth = 8.0;
+const CGFloat kLowerPadding = 5.0;
const CGFloat kMinimumContainerWidth = 10.0;
+const CGFloat kRightBorderXOffset = -1.0;
+const CGFloat kRightBorderWidth = 1.0;
+const CGFloat kRightBorderGrayscale = 0.5;
+const CGFloat kUpperPadding = 9.0;
} // namespace
@interface BrowserActionsContainerView(Private)
@@ -51,6 +56,24 @@ const CGFloat kMinimumContainerWidth = 10.0;
return self;
}
+- (void)drawRect:(NSRect)dirtyRect {
+ NSRect bounds = [self bounds];
+ NSColor* middleColor =
+ [NSColor colorWithCalibratedWhite:kRightBorderGrayscale alpha:1.0];
+ NSColor* endPointColor =
+ [NSColor colorWithCalibratedWhite:kRightBorderGrayscale alpha:0.0];
+ scoped_nsobject<NSGradient> borderGradient([[NSGradient alloc]
+ initWithColorsAndLocations:endPointColor, (CGFloat)0.0,
+ middleColor, (CGFloat)0.5,
+ endPointColor, (CGFloat)1.0,
+ nil]);
+ CGFloat xPos = bounds.origin.x + bounds.size.width - kRightBorderWidth +
+ kRightBorderXOffset;
+ NSRect borderRect = NSMakeRect(xPos, kLowerPadding, kRightBorderWidth,
+ bounds.size.height - kUpperPadding);
+ [borderGradient drawInRect:borderRect angle:90.0];
+}
+
- (void)setResizable:(BOOL)resizable {
if (resizable == resizable_)
return;
diff --git a/chrome/browser/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
index 0b9a9cc..19a1d56 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
@@ -40,8 +40,9 @@ const CGFloat kAnimationDuration = 0.2;
const CGFloat kButtonOpacityLeadPadding = 5.0;
const CGFloat kChevronHeight = 28.0;
const CGFloat kChevronLowerPadding = 5.0;
+const CGFloat kChevronRightPadding = 5.0;
const CGFloat kChevronWidth = 14.0;
-const CGFloat kGrippyXOffset = 7.0;
+const CGFloat kGrippyXOffset = 5.0;
} // namespace
@interface BrowserActionsController(Private)
@@ -550,12 +551,16 @@ class ExtensionsServiceObserverBridge : public NotificationObserver,
- (CGFloat)containerWidthWithButtonCount:(NSUInteger)buttonCount {
CGFloat width = 0.0;
if (buttonCount > 0) {
- width = kGrippyXOffset +
+ width = kGrippyXOffset + (2 * kBrowserActionButtonPadding) +
(buttonCount * (kBrowserActionWidth + kBrowserActionButtonPadding));
}
// Make room for the chevron if any buttons are hidden.
- if ([self buttonCount] != [self visibleButtonCount])
+ if ([self buttonCount] != [self visibleButtonCount]) {
width += kChevronWidth + kBrowserActionButtonPadding;
+ // Add more space if all buttons are hidden.
+ if ([self visibleButtonCount] == 0)
+ width += 3 * kBrowserActionButtonPadding;
+ }
return width;
}
@@ -728,7 +733,7 @@ class ExtensionsServiceObserverBridge : public NotificationObserver,
}
- (void)updateChevronPositionInFrame:(NSRect)frame {
- CGFloat xPos = NSWidth(frame) - kChevronWidth;
+ CGFloat xPos = NSWidth(frame) - kChevronWidth - kChevronRightPadding;
NSRect buttonFrame = NSMakeRect(xPos,
kChevronLowerPadding,
kChevronWidth,
generated by cgit v1.1 at 2025-02-01 03:33:37 +0000