colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 21:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Toolbar CPToolbarDisplayModeIconOnly support.

Browse Source
This commit is contained in:
Alexander Ljungberg
2012-06-12 23:05:16 +01:00
parent 3bc1849041
commit 026c210e64
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPToolbar.j
+14 -2
View File
@@ -91,7 +91,7 @@ var TOOLBAR_REGULAR_HEIGHT = 59.0,
@implementation CPToolbar : CPObject
{
CPString _identifier;
CPToolbarDisplayMode _displayMode;
CPToolbarDisplayMode _displayMode @accessors(property=displayMode);
BOOL _showsBaselineSeparator;
BOOL _allowsUserCustomization;
BOOL _isVisible;
@@ -246,6 +246,15 @@ var TOOLBAR_REGULAR_HEIGHT = 59.0,
[self _reloadToolbarItems];
}
- (void)setDisplayMode:(CPToolbarDisplayMode)aDisplayMode
{
if (_displayMode === aDisplayMode)
return;
_displayMode = aDisplayMode;
[self _reloadToolbarItems];
}
/* @ignore */
- (void)_loadConfiguration
{
@@ -1039,7 +1048,10 @@ var LABEL_MARGIN = 2.0;
[self setEnabled:[_toolbarItem isEnabled]];
_labelSize = [_labelField frame].size;
var iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly;
[_labelField setHidden:iconOnly];
_labelSize = iconOnly ? CGSizeMakeZero(): [_labelField frame].size;
_minSize = CGSizeMake(MAX(_labelSize.width, minSize.width), _labelSize.height + minSize.height + LABEL_MARGIN);
_maxSize = CGSizeMake(MAX(_labelSize.width, maxSize.width), 100000000.0);