colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-30 20:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enables additional buttonTypes for CPButton

Browse Source
This commit is contained in:
aradabaugh committed 2012-01-24 22:50:01 -07:00
1 parent 6bc3d49ba2
commit edd09ef06a
2 files changed
+38 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPButton.j
+34 -11
View File
@@ -55,8 +55,8 @@ CPRadioButton = 4; // Deprecated, use CPRadio instead.
CPMomentaryChangeButton = 5;
CPOnOffButton = 6;
CPMomentaryPushInButton = 7;
CPMomentaryPushButton = 0;
CPMomentaryLight = 7;
CPMomentaryPushButton = 0; // Deprecated, use CPMomentaryLightButton instead.
CPMomentaryLight = 7; // Deprecated, use CPMomentaryPushInButton instead.
CPNoButtonMask = 0;
CPContentsButtonMask = 1;
@@ -95,6 +95,7 @@ CPButtonImageOffset = 3.0;
CPString _title;
CPString _alternateTitle;
CPString _displayTitle;
CPInteger _showsStateBy;
CPInteger _highlightsBy;
@@ -176,6 +177,8 @@ CPButtonImageOffset = 3.0;
// Continuous button defaults.
_periodicInterval = 0.05;
_periodicDelay = 0.5;
_displayTitle = "";
}
// Setting the state
@@ -414,7 +417,7 @@ CPButtonImageOffset = 3.0;
[self setShowsStateBy:CPNoCellMask];
break;
case CPMomentaryChangeButton: [self setHighlightsBy:CPContentsCellMask];
case CPMomentaryChangeButton: [self setHighlightsBy:CPChangeGrayCellMask | CPContentsCellMask];
[self setShowsStateBy:CPNoCellMask];
break;
@@ -426,7 +429,7 @@ CPButtonImageOffset = 3.0;
[self setShowsStateBy:CPChangeBackgroundCellMask];
break;
case CPToggleButton: [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
case CPToggleButton: [self setHighlightsBy:CPPushInCellMask];
[self setShowsStateBy:CPContentsCellMask];
break;
@@ -494,20 +497,35 @@ CPButtonImageOffset = 3.0;
- (BOOL)startTrackingAt:(CGPoint)aPoint
{
[self highlight:YES];
if (_highlightsBy !== CPToggleButton)
[self highlight:YES];
if (_highlightsBy === CPMomentaryChangeButton && [self alternateTitle])
_displayTitle = [self alternateTitle];
return [super startTrackingAt:aPoint];
}
- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
{
[self highlight:NO];
[self invalidateTimers];
[super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
[self invalidateTimers];
if (mouseIsUp && CGRectContainsPoint([self bounds], aPoint))
[self setNextState];
[self setNextState];
if (_highlightsBy === CPOnOffButton && [self state] !== CPOffState)
mouseIsUp = false;
if (_highlightsBy === CPToggleButton)
if ([self state] === CPOnState && [self alternateTitle])
_displayTitle = [self alternateTitle];
else
_displayTitle = [self title];
if (_highlightsBy === CPMomentaryChangeButton)
_displayTitle = [self title];
[super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
}
- (void)invalidateTimers
@@ -639,9 +657,14 @@ CPButtonImageOffset = 3.0;
positioned:CPWindowAbove
relativeToEphemeralSubviewNamed:@"bezel-view"];
if ([self title] && _displayTitle === "")
{
_displayTitle = [self title];
}
if (contentView)
{
[contentView setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title];
[contentView setText:_displayTitle];
[contentView setImage:[self currentValueForThemeAttribute:@"image"]];
[contentView setImageOffset:[self currentValueForThemeAttribute:@"image-offset"]];
AppKit/CPControl.j
+4 -1
View File
@@ -385,7 +385,10 @@ var CPControlBlackColor = [CPColor blackColor];
- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
{
[self highlight:NO];
if ( mouseIsUp )
[self highlight:NO];
else
[self highlight:YES];
}
- (void)mouseDown:(CPEvent)anEvent