Fix theme setting
This commit is contained in:
+3
-16
@@ -334,12 +334,8 @@ function config_load_theme(theme: string, tag_redraw: bool = true) {
|
||||
|
||||
if (theme != "default.json") {
|
||||
let b: buffer_t = data_get_blob("themes/" + theme);
|
||||
let parsed: any = json_parse(sys_buffer_to_string(b));
|
||||
for (let i: i32 = 0; i < zui_theme_keys.length; ++i) {
|
||||
let key: string = zui_theme_keys[i];
|
||||
// @ts-ignore
|
||||
// base_theme[key] = parsed[key]; ////
|
||||
}
|
||||
let parsed: zui_theme_t = json_parse(sys_buffer_to_string(b));
|
||||
base_theme = parsed;
|
||||
}
|
||||
|
||||
base_theme.FILL_WINDOW_BG = true;
|
||||
@@ -347,16 +343,7 @@ function config_load_theme(theme: string, tag_redraw: bool = true) {
|
||||
if (tag_redraw) {
|
||||
for (let i: i32 = 0; i < base_get_uis().length; ++i) {
|
||||
let ui: zui_t = base_get_uis()[i];
|
||||
|
||||
// ui.ops.theme = base_theme;
|
||||
|
||||
for (let i: i32 = 0; i < zui_theme_keys.length; ++i) {
|
||||
let key: string = zui_theme_keys[i];
|
||||
// @ts-ignore
|
||||
// ui.ops.theme[key] = base_theme[key]; ////
|
||||
}
|
||||
base_theme = ui.ops.theme;
|
||||
|
||||
ui.ops.theme = base_theme;
|
||||
}
|
||||
ui_base_tag_ui_redraw();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user