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

Added background highlight to menu bar and fixed highligh turning off after stopping tracking in menu bar.

Browse Source 
Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I
2009-12-02 16:39:38 -08:00
parent 78795e3167
commit 150ee44da0
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPMenu/_CPMenuBarWindow.j
+7 -4
View File
@@ -119,7 +119,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
if (!aColor)
{
if (!_CPMenuBarWindowBackgroundColor)
_CPMenuBarWindowBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPMenuBarWindow class]] pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackground.png"] size:CGSizeMake(1.0, 18.0)]];
_CPMenuBarWindowBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPMenuBarWindow class]] pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackground.png"] size:CGSizeMake(1.0, 28.0)]];
[[self contentView] setBackgroundColor:_CPMenuBarWindowBackgroundColor];
}
@@ -326,7 +326,10 @@ var _CPMenuBarWindowBackgroundColor = nil,
beginTracking:anEvent
menuContainer:self
constraintRect:constraintRect
callback:nil];
callback:function(aMenuContainer, aMenu)
{
[aMenu _highlightItemAtIndex:CPNotFound];
}];
}
- (CPFont)font
@@ -366,13 +369,13 @@ var _CPMenuBarWindowBackgroundColor = nil,
{
[menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
x += CGRectGetWidth([menuItemView frame]) + MENUBAR_MARGIN;
x += CGRectGetWidth([menuItemView frame]);
}
else
{
[menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
x = CGRectGetMinX([menuItemView frame]) - MENUBAR_MARGIN;
x = CGRectGetMinX([menuItemView frame]);
}
}
AppKit/CPMenuItem/_CPMenuItemMenuBarView.j
+14 -12
View File
@@ -1,9 +1,9 @@
var LEFT_MARGIN = 5.0,
RIGHT_MARGIN = 5.0,
var HORIZONTAL_MARGIN = 8.0,
SUBMENU_INDICATOR_MARGIN = 5.0,
VERTICAL_MARGIN = 4.0;
var SUBMENU_INDICATOR_COLOR = nil,
var SelectionColor = nil,
SUBMENU_INDICATOR_COLOR = nil,
_CPMenuItemSelectionColor = nil,
_CPMenuItemTextShadowColor = nil,
@@ -26,15 +26,17 @@ var SUBMENU_INDICATOR_COLOR = nil,
+ (void)initialize
{
if (self !== [_CPMenuItemStandardView class])
if (self !== [_CPMenuItemMenuBarView class])
return;
var bundle = [CPBundle bundleForClass:self];
SelectionColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png"] size:CGSizeMake(1.0, 28.0)]];
SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
_CPMenuItemSelectionColor = [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
_CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0]
var bundle = [CPBundle bundleForClass:self];
_CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
_CPMenuItemDefaultStateImages[CPOffState] = nil;
_CPMenuItemDefaultStateHighlightedImages[CPOffState] = nil;
@@ -57,7 +59,7 @@ var SUBMENU_INDICATOR_COLOR = nil,
if (self)
{
_imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(LEFT_MARGIN, 0.0, 0.0, 0.0)];
_imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(HORIZONTAL_MARGIN, 0.0, 0.0, 0.0)];
[_imageAndTextView setImagePosition:CPImageLeft];
[_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
@@ -95,7 +97,7 @@ var SUBMENU_INDICATOR_COLOR = nil,
- (void)update
{
var x = LEFT_MARGIN,
var x = HORIZONTAL_MARGIN,
height = 0.0;
[_imageAndTextView setFont:[_menuItem font] || _font];
@@ -123,7 +125,7 @@ var SUBMENU_INDICATOR_COLOR = nil,
submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
x += CGRectGetWidth(submenuViewFrame);
x = CGRectGetMaxX(submenuViewFrame);
height = MAX(height, CGRectGetHeight(submenuViewFrame));
}
else
@@ -140,7 +142,7 @@ var SUBMENU_INDICATOR_COLOR = nil,
[_submenuIndicatorView setFrame:submenuViewFrame];
}
_minSize = CGSizeMake(x + RIGHT_MARGIN, height);
_minSize = CGSizeMake(x + HORIZONTAL_MARGIN, height);
[self setAutoresizesSubviews:NO];
[self setFrameSize:_minSize];
@@ -155,7 +157,7 @@ var SUBMENU_INDICATOR_COLOR = nil,
if (shouldHighlight)
{
[self setBackgroundColor:_CPMenuItemSelectionColor];
[self setBackgroundColor:SelectionColor];
[_imageAndTextView setTextColor:[CPColor whiteColor]];
[_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 151 B