Author: fredkiefer
Date: Sat Oct 3 23:49:35 2015
New Revision: 39026
URL: http://svn.gna.org/viewcvs/gnustep?rev=39026&view=rev
Log:
* Headers/gsc/GSGState.h
* Source/gsc/GSContext.m
* Source/gsc/GSGState.m
* Source/cairo/CairoGState.m
Implement per gstate methods for antialias, patternPhase and
compositingOperation.
Modified:
libs/back/trunk/ChangeLog
libs/back/trunk/Headers/gsc/GSGState.h
libs/back/trunk/Source/cairo/CairoGState.m
libs/back/trunk/Source/gsc/GSContext.m
libs/back/trunk/Source/gsc/GSGState.m
Modified: libs/back/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/ChangeLog?rev=39026&r1=39025&r2=39026&view=diff
==============================================================================
--- libs/back/trunk/ChangeLog (original)
+++ libs/back/trunk/ChangeLog Sat Oct 3 23:49:35 2015
@@ -1,3 +1,12 @@
+2015-10-03 Fred Kiefer <[email protected]>
+
+ * Headers/gsc/GSGState.h
+ * Source/gsc/GSContext.m
+ * Source/gsc/GSGState.m
+ * Source/cairo/CairoGState.m
+ Implement per gstate methods for antialias, patternPhase and
+ compositingOperation.
+
2015-09-20 Fred Kiefer <[email protected]>
* Source/cairo/CairoGState.m: Preliminary support for anti alias
Modified: libs/back/trunk/Headers/gsc/GSGState.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Headers/gsc/GSGState.h?rev=39026&r1=39025&r2=39026&view=diff
==============================================================================
--- libs/back/trunk/Headers/gsc/GSGState.h (original)
+++ libs/back/trunk/Headers/gsc/GSGState.h Sat Oct 3 23:49:35 2015
@@ -69,6 +69,9 @@
NSAffineTransform *textCtm; /* Text transform - concat with ctm */
GSTextDrawingMode textMode;
BOOL viewIsFlipped;
+ BOOL _antialias;
+ NSPoint _patternPhase;
+ NSCompositingOperation _compositingOperation;
}
- initWithDrawContext: (GSContext *)context;
@@ -79,6 +82,13 @@
- (void) setColor: (device_color_t *)color state: (color_state_t)cState;
- (void) GSSetPatterColor: (NSImage*)image;
+
+- (void) setShouldAntialias: (BOOL)antialias;
+- (BOOL) shouldAntialias;
+- (NSPoint) patternPhase;
+- (void) setPatternPhase: (NSPoint)phase;
+- (NSCompositingOperation) compositingOperation;
+- (void) setCompositingOperation:(NSCompositingOperation) operation;
- (void) compositeGState: (GSGState *)source
fromRect: (NSRect)aRect
Modified: libs/back/trunk/Source/cairo/CairoGState.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/cairo/CairoGState.m?rev=39026&r1=39025&r2=39026&view=diff
==============================================================================
--- libs/back/trunk/Source/cairo/CairoGState.m (original)
+++ libs/back/trunk/Source/cairo/CairoGState.m Sat Oct 3 23:49:35 2015
@@ -723,8 +723,7 @@
break;
}
}
- // FIXME: Should be part of the state
- cairo_set_antialias(_ct, [drawcontext shouldAntialias] ?
CAIRO_ANTIALIAS_DEFAULT : CAIRO_ANTIALIAS_NONE);
+ cairo_set_antialias(_ct, [self shouldAntialias] ? CAIRO_ANTIALIAS_DEFAULT :
CAIRO_ANTIALIAS_NONE);
}
- (void) DPSclip
Modified: libs/back/trunk/Source/gsc/GSContext.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/gsc/GSContext.m?rev=39026&r1=39025&r2=39026&view=diff
==============================================================================
--- libs/back/trunk/Source/gsc/GSContext.m (original)
+++ libs/back/trunk/Source/gsc/GSContext.m Sat Oct 3 23:49:35 2015
@@ -254,6 +254,36 @@
return gstate;
}
+- (void) setShouldAntialias: (BOOL)antialias
+{
+ [gstate setShouldAntialias: antialias];
+}
+
+- (BOOL) shouldAntialias
+{
+ return [gstate shouldAntialias];
+}
+
+- (NSPoint) patternPhase
+{
+ return [gstate patternPhase];
+}
+
+- (void) setPatternPhase: (NSPoint)phase
+{
+ [gstate setPatternPhase: phase];
+}
+
+- (NSCompositingOperation) compositingOperation
+{
+ return [gstate compositingOperation];
+}
+
+- (void) setCompositingOperation: (NSCompositingOperation)operation
+{
+ [gstate setCompositingOperation: operation];
+}
+
@end
@implementation GSContext (Ops)
Modified: libs/back/trunk/Source/gsc/GSGState.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/gsc/GSGState.m?rev=39026&r1=39025&r2=39026&view=diff
==============================================================================
--- libs/back/trunk/Source/gsc/GSGState.m (original)
+++ libs/back/trunk/Source/gsc/GSGState.m Sat Oct 3 23:49:35 2015
@@ -141,6 +141,36 @@
- (void) GSSetPatterColor: (NSImage*)image
{
ASSIGN(pattern, image);
+}
+
+- (void) setShouldAntialias: (BOOL)antialias
+{
+ _antialias = antialias;
+}
+
+- (BOOL) shouldAntialias
+{
+ return _antialias;
+}
+
+- (NSPoint) patternPhase
+{
+ return _patternPhase;
+}
+
+- (void) setPatternPhase: (NSPoint)phase
+{
+ _patternPhase = phase;
+}
+
+- (NSCompositingOperation) compositingOperation
+{
+ return _compositingOperation;
+}
+
+- (void) setCompositingOperation: (NSCompositingOperation)operation
+{
+ _compositingOperation = operation;
}
// This is only a fall back, the method should not be called any more.
@@ -1285,7 +1315,7 @@
[ictm invert];
size = [color_pattern size];
- patternPhase = [drawcontext patternPhase];
+ patternPhase = [self patternPhase];
if (!NSEqualPoints(patternPhase, NSZeroPoint))
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
