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

2005-01-24 00:48 Alexander Malmberg <alexander@malmberg.org>

Browse source 
* Source/NSImageCell.m (-drawInteriorWithFrame:inView:): Draw
	the image using the right size, but don't scale it. Work around
	bug #11712.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@20606 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2005-01-23 23:45:20 +00:00
parent 02a7f545d7
commit 27333c9d4c
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-01-24 00:48 Alexander Malmberg <alexander@malmberg.org>
* Source/NSImageCell.m (-drawInteriorWithFrame:inView:): Draw
the image using the right size, but don't scale it. Work around
bug #11712.
2005-01-22 Adrian Robert <arobert@cogsci.ucsd.edu>
* Source/NSFontManager.m (-fontWithFamily:traits:weight:size:)
Corrected logic in fallback approximate trait search for weight 5 or 6

34
Source/NSImageCell.m
View file

@ -226,36 +226,27 @@ scaleProportionally(NSSize imageSize, NSRect canvasRect)
case NSScaleProportionally:
{
NSDebugLLog(@"NSImageCell", @"NSScaleProportionally");
[_cell_image setScalesWhenResized:YES];
[_cell_image setSize: scaleProportionally (_original_image_size,
cellFrame)];
imageSize = scaleProportionally ([_cell_image size], cellFrame);
break;
}
case NSScaleToFit:
{
NSDebugLLog(@"NSImageCell", @"NSScaleToFit");
[_cell_image setScalesWhenResized:YES];
[_cell_image setSize: cellFrame.size];
imageSize = cellFrame.size;
break;
}
default:
case NSScaleNone:
{
NSDebugLLog(@"NSImageCell", @"NSScaleNone");
[_cell_image setScalesWhenResized:NO];
// don't let the image size overrun the space available
if (_original_image_size.width > cellFrame.size.width
|| _original_image_size.height > cellFrame.size.height)
[_cell_image setSize: cellFrame.size];
else
[_cell_image setSize: _original_image_size];
imageSize = [_cell_image size];
break;
}
}
imageSize = [_cell_image size];
switch (_imageAlignment)
{
default:
case NSImageAlignLeft:
position.x = xLeftInRect(imageSize, cellFrame);
position.y = yCenterInRect(imageSize, cellFrame, is_flipped);
@ -299,7 +290,20 @@ scaleProportionally(NSSize imageSize, NSRect canvasRect)
position.y += imageSize.height;
// draw!
[_cell_image compositeToPoint: position operation: NSCompositeSourceOver];
/* TODO: Clean this up when bug #11712 is fixed. */
if (NSEqualSizes(imageSize, [_cell_image size]))
[_cell_image compositeToPoint: position operation: NSCompositeSourceOver];
else
{
BOOL wasScalable = [_cell_image scalesWhenResized];
[_cell_image setScalesWhenResized: YES];
[_cell_image drawRepresentation:
[_cell_image bestRepresentationForDevice: nil]
inRect:
NSMakeRect(position.x, position.y, imageSize.width,
imageSize.height)];
[_cell_image setScalesWhenResized: wasScalable];
}
if (_cell.shows_first_responder)
NSDottedFrameRect(cellFrame);