aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-07-18 18:09:32 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-07-18 18:11:37 +0900
commitd2fcfafb465fb5f7a9d1f167b811b9cc323bc206 (patch)
treea7f2953f709a7e23e98811f4b15aa3fa55fa346c /src/lib/elementary
parenttests: Show use of eo_override for custom layout (diff)
downloadefl-d2fcfafb465fb5f7a9d1f167b811b9cc323bc206.tar.gz
win: Set window alpha when changing theme
This sets the window alpha back to 0 when switching from a theme with alpha to one without. Thanks @bu5hm4n for asking about this.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_win.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 9ebe84e708..b50ff41d02 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -5635,9 +5635,9 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
if (!ret) int_ret = ELM_THEME_APPLY_FAILED;
+ s = edje_object_data_get(sd->edje, "alpha");
if (!sd->theme_alpha)
{
- s = edje_object_data_get(sd->edje, "alpha");
if (s)
{
if (!strcmp(s, "1") ||
@@ -5648,6 +5648,14 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
}
}
}
+ else
+ {
+ if (!s || ((strcmp(s, "1") != 0) && (strcmp(s, "false") != 0)))
+ {
+ sd->theme_alpha = 0;
+ _elm_win_apply_alpha(obj, sd);
+ }
+ }
return int_ret;
}