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

Correction for bug #12412.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@21041 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2005-04-03 19:03:38 +00:00
parent c55a8d1a73
commit 7036061d5d
2 changed files with 83 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-04-03 14:53 Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSCustomImageRep.m: Allow drawing if the delegate is
set since the size may not have been set as of yet. This behavior
is consistent with that observed on OPENSTEP4.2/Mach. This fix
corrects bug #12412.
2005-04-03 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/AppKit/NSTextView.h: Keep track of whether we are acting

77
Source/NSCustomImageRep.m
View file

@ -26,8 +26,13 @@
*/
#include "config.h"
#include "AppKit/NSCustomImageRep.h"
#include <Foundation/NSCoder.h>
#include <Foundation/NSDebug.h>
#include "AppKit/NSCustomImageRep.h"
#include "AppKit/NSGraphicsContext.h"
#include "AppKit/NSView.h"
#include "AppKit/NSColor.h"
#include "AppKit/DPSOperators.h"
@implementation NSCustomImageRep
@ -65,6 +70,76 @@
return YES;
}
//
// TODO: For both of the following methods we can extract the
// logic in the superclass to another method and call it here
// if the delegate is set from both places.
//
- (BOOL) drawAtPoint: (NSPoint)aPoint
{
BOOL ok, reset;
NSGraphicsContext *ctxt;
NSAffineTransform *ctm = nil;
// if both are zero and the delegate isn't set, return no.
if (_size.width == 0 && _size.height == 0 && _delegate == nil)
return NO;
NSDebugLLog(@"NSImage", @"Drawing at point %f %f\n", aPoint.x, aPoint.y);
reset = 0;
ctxt = GSCurrentContext();
if (aPoint.x != 0 || aPoint.y != 0)
{
if ([[ctxt focusView] isFlipped])
aPoint.y -= _size.height;
ctm = GSCurrentCTM(ctxt);
DPStranslate(ctxt, aPoint.x, aPoint.y);
reset = 1;
}
ok = [self draw];
if (reset)
GSSetCTM(ctxt, ctm);
return ok;
}
- (BOOL) drawInRect: (NSRect)aRect
{
NSSize scale;
BOOL ok;
NSGraphicsContext *ctxt;
NSAffineTransform *ctm;
NSDebugLLog(@"NSImage", @"Drawing in rect (%f %f %f %f)\n",
NSMinX(aRect), NSMinY(aRect), NSWidth(aRect), NSHeight(aRect));
// if both are zero and the delegate isn't set.
if (_size.width == 0 && _size.height == 0 && _delegate == nil)
return NO;
ctxt = GSCurrentContext();
// if either is zero, don't scale at all.
if(_size.width == 0 || _size.height == 0)
{
scale = NSMakeSize(NSWidth(aRect),
NSHeight(aRect));
}
else
{
scale = NSMakeSize(NSWidth(aRect) / _size.width,
NSHeight(aRect) / _size.height);
}
if ([[ctxt focusView] isFlipped])
aRect.origin.y -= NSHeight(aRect);
ctm = GSCurrentCTM(ctxt);
DPStranslate(ctxt, NSMinX(aRect), NSMinY(aRect));
DPSscale(ctxt, scale.width, scale.height);
ok = [self draw];
GSSetCTM(ctxt, ctm);
return ok;
}
// NSCoding protocol
- (void) encodeWithCoder: (NSCoder*)aCoder
{