summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-01-12 18:01:15 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-01-12 18:01:15 +0900
commit4d8b6d54bc31c82afe33ea3f9c64eb872bc1c885 (patch)
tree3b38caa345203067becea2ffdcd96451955aee47 /src
parentccc68f0719965cc910c1a180a5b1f7e38c38f52e (diff)
elm_win - fix getting of stack id string if win id changes
new feature. win id changed with csd pus alpha so reget stack id string then
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_win.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 3c7005d208..0c14e7bcf7 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2998,7 +2998,16 @@ _elm_ee_xwin_get(const Ecore_Evas *ee)
2998static void 2998static void
2999_internal_elm_win_xwindow_get(Efl_Ui_Win_Data *sd) 2999_internal_elm_win_xwindow_get(Efl_Ui_Win_Data *sd)
3000{ 3000{
3001 Ecore_X_Window pwin = sd->x.xwin;
3001 sd->x.xwin = _elm_ee_xwin_get(sd->ee); 3002 sd->x.xwin = _elm_ee_xwin_get(sd->ee);
3003 if (sd->x.xwin != pwin)
3004 {
3005 char buf[128];
3006
3007 snprintf(buf, sizeof(buf), "%x", sd->x.xwin);
3008 eina_stringshare_del(sd->stack_id);
3009 sd->stack_id = eina_stringshare_add(buf);
3010 }
3002} 3011}
3003#endif 3012#endif
3004 3013
@@ -4923,14 +4932,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
4923 4932
4924#ifdef HAVE_ELEMENTARY_X 4933#ifdef HAVE_ELEMENTARY_X
4925 _internal_elm_win_xwindow_get(sd); 4934 _internal_elm_win_xwindow_get(sd);
4926 if (sd->x.xwin) 4935 if (sd->x.xwin) ecore_x_io_error_handler_set(_elm_x_io_err, NULL);
4927 {
4928 char buf[128];
4929
4930 ecore_x_io_error_handler_set(_elm_x_io_err, NULL);
4931 snprintf(buf, sizeof(buf), "%x", sd->x.xwin);
4932 sd->stack_id = eina_stringshare_add(buf);
4933 }
4934#endif 4936#endif
4935 4937
4936#ifdef HAVE_ELEMENTARY_WL2 4938#ifdef HAVE_ELEMENTARY_WL2