InfernalGames/haxework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(translate): fix provider usage

Browse Source
This commit is contained in:
shmyga
2024-07-07 15:16:16 +03:00
parent 0a6f7841e1
commit 8f30eff1dd
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
haxelib.json
View File

@@ -4,7 +4,7 @@
"license": "MIT", "license": "MIT",
"tags": ["view", "layout", "template"], "tags": ["view", "layout", "template"],
"description": "View framework.", "description": "View framework.",
"version": "2.1.0", "version": "2.1.1",
"releasenote": "Update.", "releasenote": "Update.",
"contributors": ["shmyga"], "contributors": ["shmyga"],
"classPath": "src/main", "classPath": "src/main",

13
src/main/hw/translate/TranslateString.hx
View File

@@ -3,30 +3,33 @@ package hw.translate;
import hw.provider.Provider; import hw.provider.Provider;
abstract TranslateString(String) from String to String { abstract TranslateString(String) from String to String {
@:provide var translate:ITranslate;
inline public function new(value:String, args:Array<Dynamic> = null) { inline public function new(value:String, args:Array<Dynamic> = null) {
if (args != null) { if (args != null) {
this = Provider.get(ITranslate).format(value, args); this = translate.format(value, args);
} else { } else {
this = Provider.get(ITranslate).get(value); this = translate.get(value);
} }
} }
} }
abstract TranslateArrayString(String) from String to String { abstract TranslateArrayString(String) from String to String {
@:provide var translate:ITranslate;
inline public function new(value:String, index:Int) { inline public function new(value:String, index:Int) {
this = Provider.get(ITranslate).getArray(value)[index]; this = translate.getArray(value)[index];
} }
} }
abstract TranslatePluralString(String) from String to String { abstract TranslatePluralString(String) from String to String {
@:provide var translate:ITranslate;
inline public function new(value:String, num:Int, args:Array<Dynamic> = null) { inline public function new(value:String, num:Int, args:Array<Dynamic> = null) {
if (args != null) { if (args != null) {
this = Provider.get(ITranslate).formatPlurar(value, num, args); this = translate.formatPlurar(value, num, args);
} else { } else {
this = Provider.get(ITranslate).getPlural(value, num); this = translate.getPlural(value, num);
} }
} }
} }

9
src/main/hw/view/form/ButtonImageView.hx
View File

@@ -14,20 +14,15 @@ class ButtonImageView extends ButtonView {
public function new(image:BitmapData = null) { public function new(image:BitmapData = null) {
super(); super();
skin = bitmapSkin;
if (image != null) { if (image != null) {
this.image = image; this.image = image;
} }
} }
override private function set_skin(value:SkinSet):SkinSet {
value = value.slice(0);
value.unshift(bitmapSkin);
return super.set_skin(value);
}
private function set_image(value:BitmapData):BitmapData { private function set_image(value:BitmapData):BitmapData {
if (image != value) { if (image != value) {
setContentSize(value.width, value.height, "image"); setSize(value.width, value.height, "image");
image = value; image = value;
bitmapSkin.image = image; bitmapSkin.image = image;
toRedraw(); toRedraw();