2005-01-25 00:29 Alexander Malmberg <alexander@malmberg.org>

* Headers/AppKit/NSImage.h (-drawAtPoint:fromRect:fraction:)
	(-drawInRect:fromRect:operation:fraction:): Document.
	* Source/NSImage.m -drawAtPoint:fromRect:fraction:)
	(-drawInRect:fromRect:operation:fraction:): Implement.
	(min, max): New functions.
	(-drawRepresentation:inRect:): Save the gstate before drawing
	and restore it afterwards.

	Fixes bug #11712.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@20611 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2005-01-24 23:28:07 +00:00
parent 490f08fd30
commit d67b1e64cd
3 changed files with 235 additions and 11 deletions

View file

@ -3,7 +3,7 @@
Load, manipulate and display images
Copyright (C) 1996 Free Software Foundation, Inc.
Copyright (C) 1996, 2005 Free Software Foundation, Inc.
Written by: Adam Fedor <fedor@colorado.edu>
Date: Feb 1996
@ -178,10 +178,26 @@ typedef enum {
- (BOOL) drawRepresentation: (NSImageRep*)imageRep
inRect: (NSRect)aRect;
#ifndef STRICT_OPENSTEP
/** Calls -drawAtPoint:fromRect:operation:fraction: with
<code>dstRect</code> given by <code>point</code> and the size of
<code>srcRect</code>. */
- (void) drawAtPoint: (NSPoint)point
fromRect: (NSRect)srcRect
operation: (NSCompositingOperation)op
fraction: (float)delta;
/** <p>Takes the part of the receiver given by <code>srcRect</code> and
draws it in <code>dstRect</code> in the current coordinate system,
transforming the image as necessary.
</p><p>
The image is drawn as if it was drawn to a cleared window, then
dissolved using the fraction <code>delta</code> to another cleared
window, and finally composited using <code>op</code> to the
destination.
</p><p>
Note that compositing and dissolving doesn't work on all devices
(printers, in particular).
</p> */
- (void) drawInRect: (NSRect)dstRect
fromRect: (NSRect)srcRect
operation: (NSCompositingOperation)op