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

Make Font metrics properties writable

Browse Source
This commit is contained in:
Kostas Chatzikokolakis
2018-01-16 20:27:45 +01:00
committed by Joshua Granick
parent d1a4e0cfea
commit e376fd206e
1 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lime/text/Font.hx
View File

@@ -40,15 +40,15 @@ import haxe.io.Path;
class Font {
public var ascender (get, null):Int;
public var descender (get, null):Int;
@:isVar public var ascender (get, set):Null<Int>; // no "= 0", cause asset sub-classes set properties before calling
@:isVar public var descender (get, set):Null<Int>; // super(). better indicate a missing value with null anyway.
public var height (get, null):Int;
public var name (default, null):String;
public var numGlyphs (get, null):Int;
public var src:Dynamic;
public var underlinePosition (get, null):Int;
public var underlineThickness (get, null):Int;
public var unitsPerEM (get, null):Int;
@:isVar public var unitsPerEM (get, set):Null<Int>;
@:noCompletion private var __fontID:String;
@:noCompletion private var __fontPath:String;
@@ -584,28 +584,42 @@ class Font {
private function get_ascender ():Int {
private function get_ascender ():Null<Int> {
#if (lime_cffi && !macro)
return NativeCFFI.lime_font_get_ascender (src);
#else
return 0;
return ascender;
#end
}
private function get_descender ():Int {
private function set_ascender (value:Null<Int>):Null<Int> {
return ascender = value;
}
private function get_descender ():Null<Int> {
#if (lime_cffi && !macro)
return NativeCFFI.lime_font_get_descender (src);
#else
return 0;
return descender;
#end
}
private function set_descender (value:Null<Int>):Null<Int> {
return descender = value;
}
private function get_height ():Int {
#if (lime_cffi && !macro)
@@ -650,17 +664,24 @@ class Font {
}
private function get_unitsPerEM ():Int {
private function get_unitsPerEM ():Null<Int> {
#if (lime_cffi && !macro)
return NativeCFFI.lime_font_get_units_per_em (src);
#else
return 0;
return unitsPerEM;
#end
}
private function set_unitsPerEM (value:Null<Int>):Null<Int> {
return unitsPerEM = value;
}
// Native Methods