aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-04-02 16:46:14 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-04-05 18:52:57 +0900
commit08dc189053f72fff344746bde808b1382f2af693 (patch)
treeb40bd7c712e15ddeecc7c9969e90313fab18c0ce /src/lib/elementary/efl_ui_win.c
parenttests: increase step sizes for eina_fp_div and eina_fp_mul tests (diff)
downloadefl-08dc189053f72fff344746bde808b1382f2af693.tar.gz
elm win - change parent to only use win parents in efl win struct as parent
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 6fe7c16fc6..118d075dcf 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -32,6 +32,7 @@
#include "elm_part_helper.h"
#include "efl_ui_win_part.eo.h"
#include "elm_plug.eo.h"
+#include "efl_ui_win_legacy.eo.h"
#define MY_CLASS EFL_UI_WIN_CLASS
#define MY_CLASS_NAME "Efl.Ui.Win"
@@ -4788,6 +4789,9 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
}
parent = efl_parent_get(obj);
+ if (!(efl_isa(parent, EFL_UI_WIN_CLASS) ||
+ efl_isa(parent, EFL_UI_WIN_LEGACY_CLASS) ||
+ efl_isa(parent, EFL_UI_WIN_INLINED_CLASS))) parent = NULL;
/* just to store some data while trying out to create a canvas */
memset(&tmp_sd, 0, sizeof(Efl_Ui_Win_Data));
@@ -5225,12 +5229,10 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
if ((_elm_config->bgpixmap)
#ifdef HAVE_ELEMENTARY_X
- &&
- (((sd->x.xwin) && (!ecore_x_screen_is_composited(0))) ||
- (!sd->x.xwin)))
-#else
- )
+ && (((sd->x.xwin) && (!ecore_x_screen_is_composited(0))) ||
+ (!sd->x.xwin))
#endif
+ )
TRAP(sd, avoid_damage_set, ECORE_EVAS_AVOID_DAMAGE_EXPOSE);
// bg pixmap done by x - has other issues like can be redrawn by x before it
// is filled/ready by app
@@ -8634,8 +8636,6 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_win, Efl_Ui_Win_Data)
#include "efl_ui_win.eo.c"
-#include "efl_ui_win_legacy.eo.h"
-
static void
_efl_ui_win_legacy_class_constructor(Efl_Class *klass)
{