summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/elc_ctxpopup.c4
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eec4abfce..b35cc39da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -788,3 +788,7 @@
788 * Fix the elm_shutdown bug in _elm_shutdown_config. 788 * Fix the elm_shutdown bug in _elm_shutdown_config.
789 When the elm_shutdown is used after elm_config_all_flush, the segment fault occur. 789 When the elm_shutdown is used after elm_config_all_flush, the segment fault occur.
790 It's why it uses ecore_x in _prop_all_update_cb after removing it. 790 It's why it uses ecore_x in _prop_all_update_cb after removing it.
791
7922013-03-27 Mike Blumenkrantz
793
794 * fix ctxpopup geometry when parent is an elm_win
diff --git a/NEWS b/NEWS
index fe6990b18..1bf12bfe7 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,7 @@ Fixes:
26 * List : Focus_next should be executed only when access mode is enabled. 26 * List : Focus_next should be executed only when access mode is enabled.
27 * Focus highlight should be reconfigured when theme is changed. 27 * Focus highlight should be reconfigured when theme is changed.
28 * Fix the elm_shutdown bug in _elm_shutdown_config. 28 * Fix the elm_shutdown bug in _elm_shutdown_config.
29 * fix ctxpopup geometry when parent is an elm_win
29 30
30Elementary 1.7.5 31Elementary 1.7.5
31 32
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index ce4eac952..3327b01dd 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -377,6 +377,8 @@ _calc_base_geometry(Evas_Object *obj, Evas_Coord_Rectangle *rect)
377 &hover_area.y, 377 &hover_area.y,
378 &hover_area.w, 378 &hover_area.w,
379 &hover_area.h); 379 &hover_area.h);
380 if (!strcmp(elm_widget_type_get(wd->parent), "elm_win"))
381 hover_area.x = hover_area.y = 0;
380 382
381 evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL); 383 evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL);
382 384
@@ -1299,6 +1301,8 @@ elm_ctxpopup_hover_parent_set(Evas_Object *obj, Evas_Object *parent)
1299 1301
1300 //Update Background 1302 //Update Background
1301 evas_object_geometry_get(parent, &x, &y, &w, &h); 1303 evas_object_geometry_get(parent, &x, &y, &w, &h);
1304 if (!strcmp(elm_widget_type_get(parent), "elm_win"))
1305 x = y = 0;
1302 evas_object_move(wd->bg, x, y); 1306 evas_object_move(wd->bg, x, y);
1303 evas_object_resize(wd->bg, w, h); 1307 evas_object_resize(wd->bg, w, h);
1304 1308