kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve Haxe 4 dev 'operator' conflict with Cairo setOperator/getOperator instead

Browse Source
This commit is contained in:
Joshua Granick
2018-09-25 13:46:42 -07:00
parent 84909d7aa6
commit 103fcd2a53
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/lime/graphics/cairo/Cairo.hx
View File

@@ -23,7 +23,6 @@ class Cairo {
public static var versionString (get, null):String; public static var versionString (get, null):String;
public var antialias (get, set):CairoAntialias; public var antialias (get, set):CairoAntialias;
public var blendMode (get, set):CairoOperator;
public var currentPoint (get, never):Vector2; public var currentPoint (get, never):Vector2;
public var dash (get, set):Array<Float>; public var dash (get, set):Array<Float>;
public var dashCount (get, never):Int; public var dashCount (get, never):Int;
@@ -160,6 +159,17 @@ class Cairo {
} }
public function getOperator ():CairoOperator {
#if (lime_cffi && lime_cairo && !macro)
return NativeCFFI.lime_cairo_get_operator (handle);
#end
return cast 0;
}
public function identityMatrix ():Void { public function identityMatrix ():Void {
#if (lime_cffi && lime_cairo && !macro) #if (lime_cffi && lime_cairo && !macro)
@@ -401,6 +411,17 @@ class Cairo {
} }
public function setOperator (value:CairoOperator):CairoOperator {
#if (lime_cffi && lime_cairo && !macro)
NativeCFFI.lime_cairo_set_operator (handle, value);
#end
return value;
}
public function setSourceRGB (r:Float, g:Float, b:Float):Void { public function setSourceRGB (r:Float, g:Float, b:Float):Void {
#if (lime_cffi && lime_cairo && !macro) #if (lime_cffi && lime_cairo && !macro)
@@ -554,28 +575,6 @@ class Cairo {
} }
@:noCompletion private function get_blendMode ():CairoOperator {
#if (lime_cffi && lime_cairo && !macro)
return NativeCFFI.lime_cairo_get_operator (handle);
#end
return cast 0;
}
@:noCompletion private function set_blendMode (value:CairoOperator):CairoOperator {
#if (lime_cffi && lime_cairo && !macro)
NativeCFFI.lime_cairo_set_operator (handle, value);
#end
return value;
}
@:noCompletion private function get_currentPoint ():Vector2 { @:noCompletion private function get_currentPoint ():Vector2 {
#if (lime_cffi && lime_cairo && !macro) #if (lime_cffi && lime_cairo && !macro)