diff --git a/Bundled/theme.arm b/Bundled/theme.arm new file mode 100644 index 00000000..9006f170 --- /dev/null +++ b/Bundled/theme.arm @@ -0,0 +1,34 @@ +{ + "FONT_SIZE": 13, + "ELEMENT_W": 100, + "ELEMENT_H": 22, + "ELEMENT_OFFSET": 2, + "ARROW_SIZE": 5, + "BUTTON_H": 17, + "CHECK_SIZE": 15, + "CHECK_SELECT_SIZE": 8, + "SCROLL_W": 8, + "TEXT_OFFSET": 8, + "TAB_W": 12, + "LINE_STRENGTH": 1, + "FLASH_SPEED": 0.5, + "TOOLTIP_DELAY": 1.0, + "FILL_WINDOW_BG": false, + "FILL_BUTTON_BG": true, + "FILL_ACCENT_BG": false, + "WINDOW_BG_COL": "0xff202020", + "WINDOW_TINT_COL": "0xffffffff", + "ACCENT_COL": "0xff404040", + "ACCENT_HOVER_COL": "0xff505050", + "ACCENT_SELECT_COL": "0xff666666", + "PANEL_BG_COL": "0xff000000", + "PANEL_TEXT_COL": "0xffeeeeee", + "BUTTON_COL": "0xff2b2b2b", + "BUTTON_TEXT_COL": "0xffcac9c7", + "BUTTON_HOVER_COL": "0xff3b3b3b", + "BUTTON_PRESSED_COL": "0xff1b1b1b", + "TEXT_COL": "0xffcac9c7", + "LABEL_COL": "0xffaaaaaa", + "ARROW_COL": "0xffcac9c7", + "SEPARATOR_COL": "0xff262626" +} diff --git a/Sources/arm/UITrait.hx b/Sources/arm/UITrait.hx index d49a5031..b0137611 100644 --- a/Sources/arm/UITrait.hx +++ b/Sources/arm/UITrait.hx @@ -228,9 +228,13 @@ class UITrait extends iron.Trait { iron.object.Uniforms.externalVec4Links = [linkVec4]; iron.object.Uniforms.externalTextureLinks.push(linkTex); - var scale = armory.data.Config.raw.window_scale; - ui = new Zui( { font: arm.App.font, scaleFactor: scale } ); - loadBundled(['cursor.png', 'mat.jpg', 'mat_empty.jpg', 'brush.jpg', 'cay_thumb.jpg'], done); + iron.data.Data.getBlob("theme.arm", function(b:kha.Blob) { + var theme:zui.Themes.TTheme = haxe.Json.parse(b.toString()); + var scale = armory.data.Config.raw.window_scale; + ui = new Zui( { theme: theme, font: arm.App.font, scaleFactor: scale } ); + + loadBundled(['cursor.png', 'mat.jpg', 'mat_empty.jpg', 'brush.jpg', 'cay_thumb.jpg'], done); + }); } var haxeTrace:Dynamic->haxe.PosInfos->Void; diff --git a/armorpaint.blend b/armorpaint.blend index 983a2266..7f586bb8 100644 Binary files a/armorpaint.blend and b/armorpaint.blend differ