gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaned the compositeGState:fromRect:toPoint:op:fraction: method

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@25442 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rio 2007-09-03 22:26:29 +00:00
parent 0035ccf210
commit b7434814bd
1 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Source/cairo/CairoGState.m
View file

@ -1073,18 +1073,19 @@ _set_op(cairo_t *ct, NSCompositingOperation op)
NSSize ssize;
cairo_pattern_t *cpattern;
cairo_matrix_t local_matrix;
BOOL copyOnSelf = NO;
if (!_ct || !source->_ct)
{
return;
}
cairo_save(_ct);
cairo_push_group (_ct);
cairo_new_path(_ct);
_set_op(_ct, op);
/*
* we check if we copy on ourself, if that's the case
* we'll use the groups trick...
*/
src = cairo_get_target(source->_ct);
if (src == cairo_get_target(_ct))
{
@ -1095,35 +1096,26 @@ _set_op(cairo_t *ct, NSCompositingOperation op)
if (!NSIsEmptyRect(NSIntersectionRect(aRect, targetRect)))
{
// NSLog(@"Copy onto self");
/*
NSLog(NSStringFromRect(aRect));
NSLog(NSStringFromPoint(aPoint));
NSLog(@"src %p(%p,%@) des %p(%p,%@)",
source,cairo_get_target(source->_ct),NSStringFromSize([source->_surface size]),
self,cairo_get_target(_ct),NSStringFromSize([_surface size]));
*/
copyOnSelf = YES;
}
}
// Undo flipping in gui
if (viewIsFlipped)
{
aPoint.y -= NSHeight(aRect);
}
cairo_save(_ct);
if (copyOnSelf) cairo_push_group (_ct);
cairo_new_path(_ct);
_set_op(_ct, op);
{
NSRect newRect;
newRect.origin = aPoint;
newRect.size = aRect.size;
[ctm boundingRectFor: newRect result: &newRect];
aPoint = newRect.origin;
}
//aPoint = [ctm transformPoint: aPoint];
[source->ctm boundingRectFor: aRect result: &aRect];
x = floorf(aPoint.x);
@ -1160,9 +1152,11 @@ _set_op(cairo_t *ct, NSCompositingOperation op)
cairo_paint(_ct);
}
cairo_pop_group_to_source (_ct);
cairo_paint(_ct);
if (copyOnSelf)
{
cairo_pop_group_to_source (_ct);
cairo_paint(_ct);
}
cairo_restore(_ct);
}