chrome/browser/ui/cocoa/tabs/tab_controller.mm - Issue 476313003: Mac: Improve tab strip layout in case of overflow

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_controller.mm

Issue 476313003: Mac: Improve tab strip layout in case of overflow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/browser_window_controller_private.mm ('K') | « chrome/browser/ui/cocoa/tabs/tab_controller.h ('k') | chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm » ('j') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tabs/tab_controller.mm

diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm

index eb62a073eafa4cb81064befc38d841bc0c89e8f5..c7ab22310e9b27978c284db33caa92b9e1a0793a 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm

@@ -71,7 +71,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {

// of the two tab edge bitmaps because these bitmaps have a few transparent

// pixels on the side. The selected tab width includes the close button width.

+ (CGFloat)minTabWidth { return 36; }

-+ (CGFloat)minSelectedTabWidth { return 52; }

++ (CGFloat)minActiveTabWidth { return 52; }

+ (CGFloat)maxTabWidth { return 214; }

+ (CGFloat)miniTabWidth { return 58; }

+ (CGFloat)appTabWidth { return 66; }

@@ -187,7 +187,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {

TabView* tabView = [self tabView];

[tabView setTitle:title];

- if ([self mini] && ![self selected]) {

+ if ([self mini] && ![self active]) {

[tabView startAlert];

}

[super setTitle:title];

@@ -273,7 +273,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {

- (BOOL)shouldShowIcon {

return chrome::ShouldTabShowFavicon(

- [self iconCapacity], [self mini], [self selected], iconView_ != nil,

+ [self iconCapacity], [self mini], [self active], iconView_ != nil,

!mediaIndicatorView_ ? TAB_MEDIA_STATE_NONE :

[mediaIndicatorView_ animatingMediaState]);

}

@@ -282,13 +282,13 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {

if (!mediaIndicatorView_)

return NO;

return chrome::ShouldTabShowMediaIndicator(

- [self iconCapacity], [self mini], [self selected], iconView_ != nil,

+ [self iconCapacity], [self mini], [self active], iconView_ != nil,

[mediaIndicatorView_ animatingMediaState]);

}

- (BOOL)shouldShowCloseButton {

return chrome::ShouldTabShowCloseButton(

- [self iconCapacity], [self mini], [self selected]);

+ [self iconCapacity], [self mini], [self active]);

}

- (void)setIconImage:(NSImage*)image {