mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-19 13:09:22 +00:00
Fix for _minimumWidth not being defined in the CPMenu class, resulting in minimum widths being applied globally, and menus appearing in strange places in desktop mode.
Reviewed by me.
This commit is contained in:
1 parent
b82c307007
commit
5c3beb4160
2 files changed
+5
-31
No files matched your search
+3
-26
@@ -62,9 +62,10 @@ var _CPMenuBarVisible = NO,
|
||||
|
||||
CPString _title;
|
||||
CPString _name;
|
||||
|
||||
|
||||
float _minimumWidth;
|
||||
|
||||
CPMutableArray _items;
|
||||
CPMenu _attachedMenu;
|
||||
|
||||
BOOL _autoenablesItems;
|
||||
BOOL _showsStateColumn;
|
||||
@@ -557,30 +558,6 @@ var _CPMenuBarVisible = NO,
|
||||
|
||||
}
|
||||
|
||||
/*!
|
||||
Returns the attaced menu, or \c nil if there isn't one.
|
||||
*/
|
||||
- (CPMenu)attachedMenu
|
||||
{
|
||||
return _attachedMenu;
|
||||
}
|
||||
|
||||
/*!
|
||||
Returns \c YES if the menu is attached to another menu.
|
||||
*/
|
||||
- (BOOL)isAttached
|
||||
{
|
||||
return _isAttached;
|
||||
}
|
||||
|
||||
/*!
|
||||
Not yet implemented
|
||||
*/
|
||||
- (CGPoint)locationOfSubmenu:(CPMenu)aMenu
|
||||
{
|
||||
// FIXME: IMPLEMENT.
|
||||
}
|
||||
|
||||
/*!
|
||||
Returns the super menu or \c nil if there is none.
|
||||
*/
|
||||
|
||||
@@ -36,14 +36,11 @@ var STICKY_TIME_INTERVAL = 500,
|
||||
CPImageView _moreAboveView;
|
||||
CPImageView _moreBelowView;
|
||||
|
||||
Function _trackingCallback;
|
||||
|
||||
CPTimeInterval _startTime;
|
||||
int _scrollingState;
|
||||
CGPoint _lastGlobalLocation;
|
||||
|
||||
BOOL _isShowingTopScrollIndicator;
|
||||
BOOL _isShowingBottomScrollIndicator;
|
||||
|
||||
Function _trackingCallback;
|
||||
BOOL _trackingCanceled;
|
||||
|
||||
CGRect _unconstrainedFrame;
|
||||
|
||||
Reference in new issue
Block a user