fix ctxpopup geom when parent is elm_win

diff --git a/ChangeLog b/ChangeLog
index eec4abfce370a1ef0458de19fffc37b7f07b62a5..b35cc39da9939da8e98b11f28b3e00c183c94513 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -788,3 +788,7 @@
         * Fix the elm_shutdown bug in _elm_shutdown_config.
         When the elm_shutdown is used after elm_config_all_flush, the segment fault occur.
         It's why it uses ecore_x in _prop_all_update_cb after removing it.
+
+2013-03-27  Mike Blumenkrantz
+
+        * fix ctxpopup geometry when parent is an elm_win

diff --git a/NEWS b/NEWS
index fe6990b180a80cb33bbf3773ff6ac1a99e56823e..1bf12bfe77eed5d19f954d1e4773a1485fd0c9df 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,7 @@ Fixes:
    * List : Focus_next should be executed only when access mode is enabled.
    * Focus highlight should be reconfigured when theme is changed.
    * Fix the elm_shutdown bug in _elm_shutdown_config.
+   * fix ctxpopup geometry when parent is an elm_win
         
 Elementary 1.7.5
 

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index ce4eac952142a28c8e84735ad730852a40c6b7c7..3327b01ddba6bc74c887ad2db7fcc04bf17749c4 100644 (file)
--- 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)
                             &hover_area.y,
                             &hover_area.w,
                             &hover_area.h);
+   if (!strcmp(elm_widget_type_get(wd->parent), "elm_win"))
+     hover_area.x = hover_area.y = 0;
 
    evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL);
 
@@ -1299,6 +1301,8 @@ elm_ctxpopup_hover_parent_set(Evas_Object *obj, Evas_Object *parent)
 
    //Update Background
    evas_object_geometry_get(parent, &x, &y, &w, &h);
+   if (!strcmp(elm_widget_type_get(parent), "elm_win"))
+     x = y = 0;
    evas_object_move(wd->bg, x, y);
    evas_object_resize(wd->bg, w, h);