aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-11-22 17:09:48 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-11-23 13:04:13 +0900
commit8c505e31917f7607c0b6607bb8c73fb39f1bce9f (patch)
tree6ce6dac9815eee30ca0578fa81900c9a7187113d /src/lib/elementary/efl_ui_win.c
parentwin: Add frame to inline and socket windows (diff)
downloadefl-8c505e31917f7607c0b6607bb8c73fb39f1bce9f.tar.gz
win: Remove menu from EDC group (fixes compatibility)
This fixes compatibility with legacy themes (ie. every single theme in existence beyond the default one, for now), by checking where to swallow the menu widget. If a legacy theme is used, the legacy swallow should be used, and it will all look correct. Moving forward I hope to get rid of the internal edje object entirely, except for compatibility reasons.
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index ae8cd53507..56e392a646 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -5320,10 +5320,10 @@ _efl_ui_win_fullscreen_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
static inline Eo *
_main_menu_swallow_get(Efl_Ui_Win_Data *sd)
{
- if (sd->frame_obj)
+ if (edje_object_part_exists(sd->legacy.edje, "elm.swallow.menu"))
{
- if (edje_object_part_exists(sd->frame_obj, "elm.swallow.menu"))
- return sd->frame_obj;
+ DBG("Detected legacy theme, using legacy swallows.");
+ return sd->legacy.edje;
}
return sd->legacy.edje;
}