From 82f273bc79ba4cf8ca98dbbec39f84128eec2694 Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Mon, 17 May 2010 20:19:00 +0000 Subject: [PATCH] * Source/NSToolbarItem.m (-setView:): Only set the min/max size of the toolbar item when it was zero. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30413 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSToolbarItem.m | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74cc1f555..d7d3d7672 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-17 Fred Kiefer + + * Source/NSToolbarItem.m (-setView:): Only set the min/max size of + the toolbar item when it was zero. + 2010-05-17 04:36-EDT Gregory John Casamento * Source/NSApplication.m: Attempt to open files from the command diff --git a/Source/NSToolbarItem.m b/Source/NSToolbarItem.m index f2002780f..7de53530c 100644 --- a/Source/NSToolbarItem.m +++ b/Source/NSToolbarItem.m @@ -1386,8 +1386,10 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovableToolbarItemPboardType"; NSSize size; size = [view frame].size; - [self setMinSize: size]; - [self setMaxSize: size]; + if (NSEqualSizes(NSZeroSize, _minSize)) + [self setMinSize: size]; + if (NSEqualSizes(NSZeroSize, _maxSize)) + [self setMaxSize: size]; [_view setToolTip: _toolTip];