gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 15:40:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidied to get rid of pretty useless private method

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4871 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-09-11 10:08:56 +00:00
parent 2c2b3d0a20
commit af0c1f62e9
6 changed files with 166 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Source/NSMenuItemCell.m
View file

@ -255,6 +255,7 @@ static BOOL usesUserKeyEquivalents = YES;
NSGraphicsContext *ctxt = GSCurrentContext();
NSRect floodRect = cellFrame;
NSString *keyQ = nil;
NSColor *backColor;
NSDrawButton(cellFrame, cellFrame);
@ -265,12 +266,13 @@ static BOOL usesUserKeyEquivalents = YES;
if (cell_highlighted)
{
[[NSColor selectedMenuItemColor] set];
backColor = [NSColor selectedMenuItemColor];
}
else
{
[[NSColor controlColor] set];
backColor = [NSColor controlColor];
}
[backColor set];
NSRectFill(floodRect);
if ([self isEnabled])
@ -293,14 +295,30 @@ static BOOL usesUserKeyEquivalents = YES;
DPSmoveto(ctxt, cellFrame.origin.x + 5, cellFrame.origin.y + 6);
DPSshow(ctxt, [[self title] cString]);
if (mcell_has_submenu) {
floodRect.origin.x = cellFrame.size.width - 12;
floodRect.origin.y += 5;
floodRect.size.height = 7;
floodRect.size.width = 7;
if (mcell_has_submenu)
{
NSSize size;
NSPoint position;
NSImage *im = [NSImage imageNamed:@"common_3DArrowRight"];
[self _drawImage:[NSImage imageNamed:@"common_3DArrowRight"] inFrame:floodRect];
} else if (keyQ = [self keyEquivalent]) {
floodRect.origin.x = cellFrame.size.width - 12;
floodRect.origin.y += 5;
floodRect.size.height = 7;
floodRect.size.width = 7;
[im setBackgroundColor: backColor];
size = [im size];
position.x = MAX(NSMidX(floodRect) - (size.width/2.),0.);
position.y = MAX(NSMidY(floodRect) - (size.height/2.),0.);
/*
* Images are always drawn with their bottom-left corner at the origin
* so we must adjust the position to take account of a flipped view.
*/
if ([control_view isFlipped])
position.y += size.height;
[im compositeToPoint: position operation: NSCompositeCopy];
}
else if (keyQ = [self keyEquivalent]) {
floodRect.origin.x = cellFrame.size.width - 12;
floodRect.origin.y += 5;
floodRect.size.height = 7;