gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-25 17:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[setButtonType:] use those new names. Corrected [cellAttribute:]

Browse source 
and [setCellAttribute:] to use the right tests. [performClick:]
now play the sound, if provided.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14668 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2002-10-07 23:42:02 +00:00
parent 24ddd8c532
commit cc1307d3ae
1 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
Source/NSButtonCell.m
View file

@ -142,13 +142,29 @@
value = 1;
break;
case NSChangeGrayCell:
if (_showAltStateMask & NSChangeGrayCellMask)
value = 1;
break;
case NSCellLightsByGray:
if (_highlightsByMask & NSChangeGrayCellMask)
value = 1;
break;
case NSChangeBackgroundCell:
if (_showAltStateMask & NSChangeBackgroundCellMask)
value = 1;
break;
case NSCellLightsByBackground:
if (_highlightsByMask & NSChangeBackgroundCellMask)
value = 1;
break;
case NSCellChangesContents:
if (_showAltStateMask & NSContentsCellMask)
value = 1;
break;
case NSCellLightsByContents:
if (_highlightsByMask & NSContentsCellMask)
value = 1;
break;
default:
value = [super cellAttribute: aParameter];
break;
@ -169,24 +185,22 @@
break;
case NSChangeGrayCell:
if (value)
_highlightsByMask |= NSChangeGrayCellMask;
_showAltStateMask |= NSChangeGrayCellMask;
else
_highlightsByMask &= ~NSChangeGrayCellMask;
_showAltStateMask &= ~NSChangeGrayCellMask;
break;
case NSChangeBackgroundCell:
if (value)
_highlightsByMask |= NSChangeBackgroundCellMask;
_showAltStateMask |= NSChangeBackgroundCellMask;
else
_highlightsByMask &= ~NSChangeBackgroundCellMask;
break;
/*
case NSCellLightsByContents:
_cell. = value;
_showAltStateMask &= ~NSChangeBackgroundCellMask;
break;
case NSCellChangesContents:
_cell. = value;
if (value)
_showAltStateMask |= NSContentsCellMask;
else
_showAltStateMask &= ~NSContentsCellMask;
break;
*/
case NSCellLightsByGray:
if (value)
_highlightsByMask |= NSChangeGrayCellMask;
@ -199,6 +213,12 @@
else
_highlightsByMask &= ~NSChangeBackgroundCellMask;
break;
case NSCellLightsByContents:
if (value)
_highlightsByMask |= NSContentsCellMask;
else
_highlightsByMask &= ~NSContentsCellMask;
break;
default:
[super setCellAttribute: aParameter to: value];
}
@ -206,8 +226,15 @@
- (void) setFont: (NSFont*)fontObject
{
// TODO Should change the size of the key equivalent font
int size;
[super setFont: fontObject];
if ((_keyEquivalentFont != nil) && (fontObject != nil) &&
((size = [fontObject pointSize]) != [_keyEquivalentFont pointSize]))
{
[self setKeyEquivalentFont: [_keyEquivalentFont fontName]
size: size];
}
}
- (void) setTitle: (NSString*)aString
@ -407,7 +434,7 @@
- (BOOL)showsBorderOnlyWhileMouseInside
{
return _shows_border_only_while_mouse_inside;
return _shows_border_only_while_mouse_inside;
}
- (void)setShowsBorderOnlyWhileMouseInside:(BOOL)show
@ -460,7 +487,7 @@
switch (buttonType)
{
case NSMomentaryLight:
case NSMomentaryLightButton:
[self setHighlightsBy: NSChangeBackgroundCellMask];
[self setShowsStateBy: NSNoCellMask];
[self setImageDimsWhenDisabled: YES];
@ -1017,29 +1044,32 @@
}
}
- (void)setSound: (NSSound *)aSound
- (void) setSound: (NSSound *)aSound
{
ASSIGN(_sound, aSound);
}
- (NSSound *)sound
- (NSSound *) sound
{
return _sound;
}
- (void)mouseEntered:(NSEvent *)event
- (void) mouseEntered: (NSEvent *)event
{
_mouse_inside = YES;
}
- (void)mouseExited:(NSEvent *)event
- (void) mouseExited: (NSEvent *)event
{
_mouse_inside = NO;
}
- (void)performClick:(id)sender
- (void) performClick: (id)sender
{
// TODO Like super plus playing the sound
if (_sound != nil)
{
[_sound play];
}
[super performClick: sender];
}