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

Improved drawing cells with images and titles

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5402 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-12-07 10:51:14 +00:00
parent 16e8e9c790
commit 19d7c90318
2 changed files with 46 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Dec 7 10:50:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSButtonCell.m: ([-drawInteriorWithFrame:inView:]) fix code
for drawing images above and below text, and add support for
drawing in a flipped view.
Tue Dec 7 7:00:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSBrowser.m: ([-setPath:]) applied fix suggested by

53
Source/NSButtonCell.m
View file

@ -406,6 +406,8 @@
NSRect titleRect;
NSSize imageSize = {0, 0};
NSColor *backgroundColor = nil;
BOOL flippedView = [control_view isFlipped];
NSCellImagePosition ipos;
// transparent buttons never draw
if ([self isTransparent])
@ -477,7 +479,20 @@
[imageToDisplay setBackgroundColor: backgroundColor];
}
switch ([self imagePosition])
ipos = [self imagePosition];
if (flippedView == YES)
{
if (ipos == NSImageAbove)
{
ipos = NSImageBelow;
}
else if (ipos == NSImageBelow)
{
ipos = NSImageAbove;
}
}
switch (ipos)
{
case NSNoImage:
imageToDisplay = nil;
@ -510,18 +525,28 @@
titleRect.size.height = cellFrame.size.height;
break;
case NSImageBelow:
imageRect = cellFrame;
imageRect.size.height /= 2;
titleRect = imageRect;
titleRect.origin.y += titleRect.size.height;
case NSImageAbove:
imageRect.origin.x = cellFrame.origin.x;
imageRect.origin.y = NSMaxY(cellFrame) - imageSize.height;
imageRect.size.width = cellFrame.size.width;
imageRect.size.height = imageSize.height;
titleRect.origin = cellFrame.origin;
titleRect.size.height = cellFrame.size.height - imageSize.height
- yDist;
titleRect.size.width = cellFrame.size.width;
break;
case NSImageAbove:
titleRect = cellFrame;
titleRect.size.height /= 2;
imageRect = titleRect;
imageRect.origin.y += imageRect.size.height;
case NSImageBelow:
imageRect.origin = cellFrame.origin;
imageRect.size.width = cellFrame.size.width;
imageRect.size.height = imageSize.height;
titleRect.origin.x = cellFrame.origin.x;
titleRect.origin.y = imageSize.height + yDist;
titleRect.size.height = cellFrame.size.height - imageSize.height
- yDist;
titleRect.size.width = cellFrame.size.width;
break;
case NSImageOverlaps:
@ -541,8 +566,10 @@
* 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;
if (flippedView)
{
position.y += size.height;
}
[imageToDisplay compositeToPoint: position operation: NSCompositeCopy];
}
if (titleToDisplay != nil)