colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-07 23:53:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow toolbar size to be changed even after the toolbar has been created.

Browse Source
This commit is contained in:
Alexander Ljungberg committed 2012-02-24 20:38:05 +00:00
1 parent 98e54d2e09
commit a16388b57d
1 file changed
+17 -3
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPToolbar.j
+17 -3
View File
@@ -95,6 +95,7 @@ var TOOLBAR_REGULAR_HEIGHT = 59.0,
BOOL _showsBaselineSeparator;
BOOL _allowsUserCustomization;
BOOL _isVisible;
int _sizeMode @accessors(property=sizeMode);
id _delegate;
@@ -108,8 +109,6 @@ var TOOLBAR_REGULAR_HEIGHT = 59.0,
CPArray _items;
CPArray _itemsSortedByVisibilityPriority;
int _sizeMode @accessors(property=sizeMode);
CPView _toolbarView;
CPWindow _window;
}
@@ -213,6 +212,16 @@ var TOOLBAR_REGULAR_HEIGHT = 59.0,
[_window _noteToolbarChanged];
}
- (void)setSizeMode:(CPToolbarSizeMode)aSize
{
if (aSize === _sizeMode)
return;
_sizeMode = aSize;
[[self _toolbarView] setFrame:[self _toolbarViewFrame]];
[_window _noteToolbarChanged];
}
- (CPWindow)_window
{
return _window;
@@ -243,12 +252,17 @@ var TOOLBAR_REGULAR_HEIGHT = 59.0,
}
- (CGRect)_toolbarViewFrame
{
return CPRectMake(0.0, 0.0, 1200.0, _sizeMode != CPToolbarSizeModeSmall ? TOOLBAR_REGULAR_HEIGHT : TOOLBAR_SMALL_HEIGHT);
}
/* @ignore */
- (CPView)_toolbarView
{
if (!_toolbarView)
{
_toolbarView = [[_CPToolbarView alloc] initWithFrame:CPRectMake(0.0, 0.0, 1200.0, _sizeMode != CPToolbarSizeModeSmall ? TOOLBAR_REGULAR_HEIGHT : TOOLBAR_SMALL_HEIGHT)];
_toolbarView = [[_CPToolbarView alloc] initWithFrame:[self _toolbarViewFrame]];
[_toolbarView setToolbar:self];
[_toolbarView setAutoresizingMask:CPViewWidthSizable];