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

Synchronised with trunk at revision 23586

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/themes@23587 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-09-22 12:29:31 +00:00
parent 7955334e4d
commit a50e814e6d
66 changed files with 3847 additions and 1439 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/NSMenuItemCell.m
View file

@ -42,7 +42,7 @@
#include "AppKit/NSMenuItemCell.h"
#include "AppKit/NSMenuView.h"
#include "AppKit/NSParagraphStyle.h"
#include "GNUstepGUI/GSDrawFunctions.h"
#include "GNUstepGUI/GSTheme.h"
@implementation NSMenuItemCell
@ -446,11 +446,11 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
if (_cell.is_highlighted && (_highlightsByMask & NSPushInCellMask))
{
[GSDrawFunctions drawGrayBezel: cellFrame : NSZeroRect];
[[GSTheme theme] drawGrayBezel: cellFrame withClip: NSZeroRect];
}
else
{
[GSDrawFunctions drawButton: cellFrame : NSZeroRect];
[[GSTheme theme] drawButton: cellFrame withClip: NSZeroRect];
}
}
@ -479,7 +479,7 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
{
cellFrame = [self keyEquivalentRectForBounds: cellFrame];
if ([_menuItem hasSubmenu])
if ([_menuItem hasSubmenu] && arrowImage != nil)
{
NSSize size;
NSPoint position;
@ -710,7 +710,8 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
// pushed in buttons contents are displaced to the bottom right 1px
if (_cell.is_bordered && (mask & NSPushInCellMask))
{
cellFrame = NSOffsetRect(cellFrame, 1., [controlView isFlipped] ? 1. : -1.);
cellFrame
= NSOffsetRect(cellFrame, 1., [controlView isFlipped] ? 1. : -1.);
}
/*