diff options
| author | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 17:48:02 +0000 |
|---|---|---|
| committer | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 17:48:02 +0000 |
| commit | d91e6a23676a9415d2f148d6887d49251e129cf2 (patch) | |
| tree | 855dea87605d4b7cce287e03bd4101e52f475c58 /chrome/browser/cocoa | |
| parent | 64f79631faaaaffbcf763a6c0ed6659b8bfd9d8a (diff) | |
| download | chromium_src-d91e6a23676a9415d2f148d6887d49251e129cf2.zip chromium_src-d91e6a23676a9415d2f148d6887d49251e129cf2.tar.gz chromium_src-d91e6a23676a9415d2f148d6887d49251e129cf2.tar.bz2 | |
Do not change sidebar width proportionally when browser window is resized.
BUG=31633
TEST=Run browser_tests and interactive_ui_tests.
Review URL: http://codereview.chromium.org/3367025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/sidebar_controller.mm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/sidebar_controller.mm b/chrome/browser/cocoa/sidebar_controller.mm index 1855358..403ec10 100644 --- a/chrome/browser/cocoa/sidebar_controller.mm +++ b/chrome/browser/cocoa/sidebar_controller.mm @@ -40,6 +40,7 @@ const int kMinWebWidth = 50; DCHECK(delegate); if ((self = [super init])) { sidebarView_.reset([sidebarView retain]); + [sidebarView_ setDelegate:self]; delegate_ = delegate; sidebarContents_ = NULL; } @@ -78,7 +79,7 @@ const int kMinWebWidth = 50; DCHECK_GE([subviews count], 1u); // |sidebarView| is a TabContentsViewCocoa object, whose ViewID was - // set to VIEW_ID_TAB_CONTAINER initially, so we need to change it to + // set to VIEW_ID_TAB_CONTAINER initially, so change it to // VIEW_ID_SIDE_BAR_CONTAINER here. NSView* sidebarView = sidebarContents->GetNativeView(); view_id_util::SetID(sidebarView, VIEW_ID_SIDE_BAR_CONTAINER); @@ -121,4 +122,14 @@ const int kMinWebWidth = 50; } } +// NSSplitViewDelegate protocol. +- (BOOL)splitView:(NSSplitView *)splitView + shouldAdjustSizeOfSubview:(NSView *)subview { + // Return NO for the sidebar view to indicate that it should not be resized + // automatically. The sidebar keeps the width set by the user. + if ([[sidebarView_ subviews] indexOfObject:subview] == 1) + return NO; + return YES; +} + @end |