diff --git a/examples/example1/src/example1.d b/examples/example1/src/example1.d
index 997666f3..fa6b2c8b 100644
--- a/examples/example1/src/example1.d
+++ b/examples/example1/src/example1.d
@@ -316,21 +316,26 @@ extern (C) int UIAppMain(string[] args) {
viewItem.add(langItem);
MenuItem themeItem = new MenuItem(new Action(62, "MENU_VIEW_THEME"));
MenuItem theme1 = (new MenuItem(new Action(621, "MENU_VIEW_THEME_DEFAULT"))).type(MenuItemType.Radio).checked(true);
- MenuItem theme2 = (new MenuItem(new Action(622, "MENU_VIEW_THEME_CUSTOM1"))).type(MenuItemType.Radio);
+ MenuItem theme2 = (new MenuItem(new Action(622, "MENU_VIEW_THEME_DARK"))).type(MenuItemType.Radio);
+ MenuItem theme3 = (new MenuItem(new Action(623, "MENU_VIEW_THEME_CUSTOM1"))).type(MenuItemType.Radio);
auto onThemeChange = delegate (MenuItem item) {
if (!item.checked)
return false;
if (item.id == 621) {
platform.instance.uiTheme = "theme_default";
} else if (item.id == 622) {
+ platform.instance.uiTheme = "theme_dark";
+ } else if (item.id == 623) {
platform.instance.uiTheme = "theme_custom1";
}
return true;
};
theme1.onMenuItemClick = onThemeChange;
theme2.onMenuItemClick = onThemeChange;
+ theme3.onMenuItemClick = onThemeChange;
themeItem.add(theme1);
themeItem.add(theme2);
+ themeItem.add(theme3);
viewItem.add(themeItem);
MenuItem windowItem = new MenuItem(new Action(3, "MENU_WINDOW"c));
@@ -842,7 +847,6 @@ void main()
window.mainWidget = contentLayout;
tabs.selectTab("tab3");
-
} else {
window.mainWidget = (new Button()).text("sample button");
}
diff --git a/examples/example1/views/res/i18n/en.ini b/examples/example1/views/res/i18n/en.ini
index 87cfc368..5016474a 100644
--- a/examples/example1/views/res/i18n/en.ini
+++ b/examples/example1/views/res/i18n/en.ini
@@ -18,8 +18,9 @@ MENU_VIEW_LANGUAGE=Interface &Language
MENU_VIEW_LANGUAGE_EN=English
MENU_VIEW_LANGUAGE_RU=Русский
MENU_VIEW_THEME=&Theme
-MENU_VIEW_THEME_DEFAULT=&Default
-MENU_VIEW_THEME_CUSTOM1=&Custom 1
+MENU_VIEW_THEME_DEFAULT=Default
+MENU_VIEW_THEME_DARK=Dark
+MENU_VIEW_THEME_CUSTOM1=Custom 1
MENU_WINDOW=&Window
MENU_WINDOW_PREFERENCES=&Preferences
MENU_HELP=&Help
diff --git a/examples/example1/views/res/i18n/ru.ini b/examples/example1/views/res/i18n/ru.ini
index 82f24a22..ab52d3d0 100644
--- a/examples/example1/views/res/i18n/ru.ini
+++ b/examples/example1/views/res/i18n/ru.ini
@@ -17,6 +17,7 @@ MENU_VIEW_LANGUAGE_EN=English
MENU_VIEW_LANGUAGE_RU=Русский
MENU_VIEW_THEME=&Тема
MENU_VIEW_THEME_DEFAULT=Стандартная
+MENU_VIEW_THEME_DARK=Тёмная
MENU_VIEW_THEME_CUSTOM1=Пример 1
MENU_WINDOW=&Окно
MENU_WINDOW_PREFERENCES=&Настройки
diff --git a/src/dlangui/platforms/common/platform.d b/src/dlangui/platforms/common/platform.d
index 5c16b962..38449d45 100644
--- a/src/dlangui/platforms/common/platform.d
+++ b/src/dlangui/platforms/common/platform.d
@@ -386,6 +386,8 @@ class Window {
_eventList = new EventList();
_timerQueue = new TimerQueue();
_backgroundColor = 0xFFFFFF;
+ if (currentTheme)
+ _backgroundColor = currentTheme.customColor(STYLE_COLOR_WINDOW_BACKGROUND);
}
~this() {
debug Log.d("Destroying window");
@@ -778,6 +780,10 @@ class Window {
}
if (_tooltip.popup)
_tooltip.popup.onThemeChanged();
+ if (currentTheme) {
+ _backgroundColor = currentTheme.customColor(STYLE_COLOR_WINDOW_BACKGROUND);
+ }
+ invalidate();
}
diff --git a/src/dlangui/widgets/controls.d b/src/dlangui/widgets/controls.d
index 6654fc32..abee249b 100644
--- a/src/dlangui/widgets/controls.d
+++ b/src/dlangui/widgets/controls.d
@@ -305,16 +305,18 @@ class UrlImageTextButton : ImageTextButton {
}
}
+
+
/// checkbox
class CheckBox : ImageTextButton {
this(string ID = null, string textResourceId = null) {
- super(ID, "btn_check", textResourceId);
+ super(ID, getCustomDrawableId("btn_check"), textResourceId);
}
this(string ID, dstring labelText) {
- super(ID, "btn_check", labelText);
+ super(ID, getCustomDrawableId("btn_check"), labelText);
}
this(string ID, UIString label) {
- super(ID, "btn_check", label);
+ super(ID, getCustomDrawableId("btn_check"), label);
}
override protected void init(string drawableId, UIString caption) {
super.init(drawableId, caption);
@@ -330,15 +332,20 @@ class CheckBox : ImageTextButton {
checked = !checked;
return super.handleClick();
}
+ /// handle theme change: e.g. reload some themed resources
+ override void onThemeChanged() {
+ if (currentTheme)
+ _icon.drawableId = getCustomDrawableId("btn_check");
+ }
}
/// radio button
class RadioButton : ImageTextButton {
this(string ID = null, string textResourceId = null) {
- super(ID, "btn_radio", textResourceId);
+ super(ID,getCustomDrawableId("btn_radio"), textResourceId);
}
this(string ID, dstring labelText) {
- super(ID, "btn_radio", labelText);
+ super(ID, getCustomDrawableId("btn_radio"), labelText);
}
override protected void init(string drawableId, UIString caption) {
super.init(drawableId, caption);
@@ -350,6 +357,12 @@ class RadioButton : ImageTextButton {
checkable = true;
}
+ /// handle theme change: e.g. reload some themed resources
+ override void onThemeChanged() {
+ if (currentTheme)
+ _icon.drawableId = getCustomDrawableId("btn_radio");
+ }
+
void uncheckSiblings() {
Widget p = parent;
if (!p)
diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d
index 199d24c1..ad67ca9f 100644
--- a/src/dlangui/widgets/styles.d
+++ b/src/dlangui/widgets/styles.d
@@ -166,6 +166,12 @@ immutable string STYLE_SETTINGS_PAGES = "SETTINGS_PAGES";
/// standard style id for settings dialog page title
immutable string STYLE_SETTINGS_PAGE_TITLE = "SETTINGS_PAGE_TITLE";
+/// window background color resource id
+immutable string STYLE_COLOR_WINDOW_BACKGROUND = "window_background";
+/// dialog background color resource id
+immutable string STYLE_COLOR_DIALOG_BACKGROUND = "dialog_background";
+
+
// Layout size constants
/// layout option, to occupy all available place
immutable int FILL_PARENT = int.max - 1;
@@ -277,6 +283,14 @@ class Style {
protected FontRef _font;
protected DrawableRef _backgroundDrawable;
+ void onThemeChanged() {
+ _backgroundDrawable.clear();
+ foreach(s; _substates)
+ s.onThemeChanged();
+ foreach(s; _children)
+ s.onThemeChanged();
+ }
+
@property const(Theme) theme() const {
if (_theme !is null)
return _theme;
@@ -334,7 +348,7 @@ class Style {
(cast(Style)this)._backgroundDrawable = drawableCache.get(image);
} else {
uint color = backgroundColor;
- (cast(Style)this)._backgroundDrawable = new SolidFillDrawable(color);
+ (cast(Style)this)._backgroundDrawable = isFullyTransparentColor(color) ? new EmptyDrawable() : new SolidFillDrawable(color);
}
return (cast(Style)this)._backgroundDrawable;
}
@@ -1357,6 +1371,11 @@ class DrawableAttribute {
}
}
+/// returns custom drawable replacement id for specified id from current theme, or returns passed value if not found or no current theme
+string getCustomDrawableId(string id) {
+ string res = currentTheme ? currentTheme.customDrawableId(id) : id;
+ return !res ? id : res;
+}
shared static ~this() {
currentTheme = null;
diff --git a/src/dlangui/widgets/widget.d b/src/dlangui/widgets/widget.d
index 1e0b74e5..3c848f1c 100644
--- a/src/dlangui/widgets/widget.d
+++ b/src/dlangui/widgets/widget.d
@@ -247,6 +247,9 @@ class Widget {
// default implementation: call recursive for children
for (int i = 0; i < childCount; i++)
child(i).onThemeChanged();
+ if (_ownStyle) {
+ _ownStyle.onThemeChanged();
+ }
}
/// returns widget id, null if not set
diff --git a/views/res/btn_background_dark.xml b/views/res/btn_background_dark.xml
new file mode 100644
index 00000000..7c86b3e0
--- /dev/null
+++ b/views/res/btn_background_dark.xml
@@ -0,0 +1,18 @@
+
+
+