gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-26 09:51:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a special case for popup buttons, akin imageRectForBounds

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35868 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rmottola 2012-12-09 23:13:49 +00:00
parent 3994c4b0bf
commit 02259cada8
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-12-10 Riccardo Mottola <rm@gnu.org>
* Source/NSMenuItemCell.m (titleRectForBounds)
Add a special case for popup buttons, akin imageRectForBounds
2012-12-08 Fred Kiefer <FredKiefer@gmx.de> 2012-12-08 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSViewController.m: Add missing #import for NSArray. * Source/NSViewController.m: Add missing #import for NSArray.

8
Source/NSMenuItemCell.m
View file

@ -526,6 +526,14 @@ static NSString *commandKeyString = @"#";
if (_needs_sizing) if (_needs_sizing)
[self calcSize]; [self calcSize];
if (_mcell_belongs_to_popupbutton && _cell.image_position)
{
// Special case: draw image on the extreme right
cellFrame.origin.x += [_menuView imageAndTitleOffset];
cellFrame.size.width = _titleWidth;
return cellFrame;
}
if ([_menuView isHorizontal] == YES) if ([_menuView isHorizontal] == YES)
{ {
/* This adjust will center us within the menubar. */ /* This adjust will center us within the menubar. */