aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-21 12:48:47 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-21 12:48:47 +0000
commit7ffec7e968f59eaad1f89c97290c218a60e57845 (patch)
treecb4c4f000bb43230de1911f6ee428ca80c5fb712
parent0ebb887d647c47ba8164e103b587a45c466325e8 (diff)
downloadenlightenment-7ffec7e968f59eaad1f89c97290c218a60e57845.tar.gz
enlightenment-7ffec7e968f59eaad1f89c97290c218a60e57845.tar.xz
enlightenment-7ffec7e968f59eaad1f89c97290c218a60e57845.zip
always show popup content on content set
this change prevents erroneous calls to the comp injected object show handler in some cases, which would cause unnecessary recalcs and strange object movements SVN revision: 84281
-rw-r--r--src/bin/e_popup.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c
index d7ef5be02..b5cbacab0 100644
--- a/src/bin/e_popup.c
+++ b/src/bin/e_popup.c
@@ -178,13 +178,11 @@ e_popup_content_set(E_Popup *pop, Evas_Object *obj)
evas_object_data_set(obj, "eobj", pop);
evas_object_move(obj, pop->zone->x + pop->x, pop->zone->y + pop->y);
evas_object_resize(obj, pop->w, pop->h);
+ evas_object_show(obj);
e_popup_layer_set(pop, pop->comp_layer, pop->layer);
e_popup_ignore_events_set(pop, pop->ignore_events);
if (pop->visible)
- {
- e_comp_win_moveresize(pop->cw, pop->zone->x + pop->x, pop->zone->y + pop->y, pop->w, pop->h);
- evas_object_show(obj);
- }
+ e_comp_win_moveresize(pop->cw, pop->zone->x + pop->x, pop->zone->y + pop->y, pop->w, pop->h);
}
EAPI void