From 9498054caa50f4997eb6bc8cc2f5e0bd1b61451b Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 9 Sep 2016 09:13:55 +0300 Subject: [PATCH] fix theme --- src/dlangui/platforms/common/platform.d | 1 - src/dlangui/widgets/styles.d | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dlangui/platforms/common/platform.d b/src/dlangui/platforms/common/platform.d index ecae846f..f33756cc 100644 --- a/src/dlangui/platforms/common/platform.d +++ b/src/dlangui/platforms/common/platform.d @@ -1445,7 +1445,6 @@ class Platform { } /// sets application UI theme - will relayout content of all windows if theme has been changed @property Platform uiTheme(string themeResourceId) { - themeResourceId = "console_" ~ themeResourceId; if (_themeId.equal(themeResourceId)) return this; Log.v("uiTheme setting new theme ", themeResourceId); diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d index cd89162d..32f68b3a 100644 --- a/src/dlangui/widgets/styles.d +++ b/src/dlangui/widgets/styles.d @@ -1567,7 +1567,7 @@ bool loadTheme(Theme theme, string resourceId, int level = 0) { /// load theme from XML file (null if failed) Theme loadTheme(string resourceId) { Theme res = new Theme(resourceId); - if (loadTheme(res, resourceId)) { + if (loadTheme(res, BACKEND_CONSOLE ? "console_" ~ resourceId : resourceId)) { res.id = resourceId; return res; }