gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-01 13:11:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSMenuItemCell.m (-drawStateImageWithFrame:inView:,

Browse source 
-drawTitleWithFrame:inView:): Remove specific drawing code, use
  general code instead.
* Source/NSMenuItemCell.m (-drawingRectForBounds:): Add call to
  calcSize.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28505 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2009-08-21 20:13:59 +00:00
parent 73ffe03b59
commit c55922adaa
2 changed files with 18 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2009-08-21 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSMenuItemCell.m (-drawStateImageWithFrame:inView:,
-drawTitleWithFrame:inView:): Remove specific drawing code, use
general code instead.
* Source/NSMenuItemCell.m (-drawingRectForBounds:): Add call to calcSize.
2009-08-21 Fred Kiefer <FredKiefer@gmx.de> 2009-08-21 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSBitmapImageRep+ICNS.m: Redefine icns_size_t to int, as * Source/NSBitmapImageRep+ICNS.m: Redefine icns_size_t to int, as

58
Source/NSMenuItemCell.m
View file

@ -545,6 +545,9 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
- (NSRect) drawingRectForBounds: (NSRect)theRect - (NSRect) drawingRectForBounds: (NSRect)theRect
{ {
if (_needs_sizing)
[self calcSize];
if ([_menuView isHorizontal] == YES) if ([_menuView isHorizontal] == YES)
{ {
/* A horizontal menu does not have borders drawn by the cell, /* A horizontal menu does not have borders drawn by the cell,
@ -603,7 +606,7 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
// Drawing. // Drawing.
// //
- (void) drawBorderAndBackgroundWithFrame: (NSRect)cellFrame - (void) drawBorderAndBackgroundWithFrame: (NSRect)cellFrame
inView: (NSView *)controlView inView: (NSView *)controlView
{ {
if ([_menuView isHorizontal] == YES) if ([_menuView isHorizontal] == YES)
{ {
@ -637,8 +640,8 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
[self drawImage: _imageToDisplay withFrame: cellFrame inView: controlView]; [self drawImage: _imageToDisplay withFrame: cellFrame inView: controlView];
} }
- (void) drawKeyEquivalentWithFrame:(NSRect)cellFrame - (void) drawKeyEquivalentWithFrame: (NSRect)cellFrame
inView:(NSView *)controlView inView: (NSView *)controlView
{ {
cellFrame = [self keyEquivalentRectForBounds: cellFrame]; cellFrame = [self keyEquivalentRectForBounds: cellFrame];
@ -686,8 +689,6 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
- (void) drawStateImageWithFrame: (NSRect)cellFrame - (void) drawStateImageWithFrame: (NSRect)cellFrame
inView: (NSView*)controlView inView: (NSView*)controlView
{ {
NSSize size;
NSPoint position;
NSImage *imageToDisplay; NSImage *imageToDisplay;
switch ([_menuItem state]) switch ([_menuItem state])
@ -712,51 +713,14 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
} }
cellFrame = [self stateImageRectForBounds: cellFrame]; cellFrame = [self stateImageRectForBounds: cellFrame];
// FIXME: We could call drawImage:withFrame:inView: here, if we knew that the code there is correct. [self drawImage: imageToDisplay withFrame: cellFrame inView: controlView];
size = [imageToDisplay size];
position.x = MAX(NSMidX(cellFrame) - (size.width/2.),0.);
position.y = MAX(NSMidY(cellFrame) - (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 ([controlView isFlipped])
{
position.y += size.height;
}
[imageToDisplay compositeToPoint: position operation: NSCompositeSourceOver];
} }
- (void) drawTitleWithFrame:(NSRect)cellFrame - (void) drawTitleWithFrame: (NSRect)cellFrame
inView:(NSView *)controlView inView: (NSView *)controlView
{ {
if ([_menuView isHorizontal] == YES) [self _drawText: [_menuItem title]
{ inFrame: [self titleRectForBounds: cellFrame]];
// FIXME: Why do we have separate drawing coce here. The alignement already
// gets adjusted when the menu view is set and the text colour looks wrong here.
id value = [NSMutableParagraphStyle defaultParagraphStyle];
NSDictionary *attr;
NSRect cf = [self titleRectForBounds: cellFrame];
if (!_imageWidth)
[value setAlignment: NSCenterTextAlignment];
attr = [[NSDictionary alloc] initWithObjectsAndKeys:
value, NSParagraphStyleAttributeName,
_font, NSFontAttributeName,
[NSColor controlTextColor], NSForegroundColorAttributeName,
nil];
[[_menuItem title] drawInRect: cf withAttributes: attr];
RELEASE(attr);
}
else
{
[self _drawText: [_menuItem title]
inFrame: [self titleRectForBounds: cellFrame]];
}
} }
- (void) _drawBorderAndBackgroundWithFrame: (NSRect)cellFrame inView: (NSView*)controlView - (void) _drawBorderAndBackgroundWithFrame: (NSRect)cellFrame inView: (NSView*)controlView