From 9f2b4983b61d1fa092106590ae00db460e786ebe Mon Sep 17 00:00:00 2001 From: luboslenco Date: Mon, 20 Aug 2018 13:07:58 +0200 Subject: [PATCH] Fix int parse --- Bundled/config.arm | 7 +++---- Sources/arm/App.hx | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Bundled/config.arm b/Bundled/config.arm index 46b9e170..e036ae40 100644 --- a/Bundled/config.arm +++ b/Bundled/config.arm @@ -1,12 +1,11 @@ { - "window_h": "900", + "window_h": 900, "window_maximizable": true, "window_minimizable": true, "window_mode": 0, - "window_msaa": "1", + "window_msaa": 1, "window_resizable": true, "window_scale": 1.0, "window_vsync": true, - "window_w": "1600", - "plugins": [] + "window_w": 1600 } \ No newline at end of file diff --git a/Sources/arm/App.hx b/Sources/arm/App.hx index b8357347..9f0f477d 100644 --- a/Sources/arm/App.hx +++ b/Sources/arm/App.hx @@ -43,6 +43,21 @@ class App extends iron.Trait { iron.data.Data.getBlob("theme.arm", function(b:kha.Blob) { iron.data.Data.getImage('color_wheel.png', function(image:kha.Image) { theme = haxe.Json.parse(b.toString()); + theme.WINDOW_BG_COL = Std.parseInt(cast theme.WINDOW_BG_COL); + theme.WINDOW_TINT_COL = Std.parseInt(cast theme.WINDOW_TINT_COL); + theme.ACCENT_COL = Std.parseInt(cast theme.ACCENT_COL); + theme.ACCENT_HOVER_COL = Std.parseInt(cast theme.ACCENT_HOVER_COL); + theme.ACCENT_SELECT_COL = Std.parseInt(cast theme.ACCENT_SELECT_COL); + theme.PANEL_BG_COL = Std.parseInt(cast theme.PANEL_BG_COL); + theme.PANEL_TEXT_COL = Std.parseInt(cast theme.PANEL_TEXT_COL); + theme.BUTTON_COL = Std.parseInt(cast theme.BUTTON_COL); + theme.BUTTON_TEXT_COL = Std.parseInt(cast theme.BUTTON_TEXT_COL); + theme.BUTTON_HOVER_COL = Std.parseInt(cast theme.BUTTON_HOVER_COL); + theme.BUTTON_PRESSED_COL = Std.parseInt(cast theme.BUTTON_PRESSED_COL); + theme.TEXT_COL = Std.parseInt(cast theme.TEXT_COL); + theme.LABEL_COL = Std.parseInt(cast theme.LABEL_COL); + theme.ARROW_COL = Std.parseInt(cast theme.ARROW_COL); + theme.SEPARATOR_COL = Std.parseInt(cast theme.SEPARATOR_COL); font = f; color_wheel = image; var scale = armory.data.Config.raw.window_scale;