raster pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=985229794d3e6601e27df6f612dc89b10ea29838

commit 985229794d3e6601e27df6f612dc89b10ea29838
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Tue Apr 1 19:52:18 2014 +0900

    menu - fix bug that happens as a result of fixing window obj position
    
    similar fix to 59cfed147b50d5b5c644ec75d2c6eb34e8b84294
---
 src/lib/elm_menu.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 952255a..d13f442 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -103,7 +103,12 @@ _submenu_sizing_eval(Elm_Menu_Item *parent_it)
    evas_object_geometry_get(VIEW(parent_it), &x2, &y2, &w2, &h2);
    evas_object_geometry_get(parent_it->submenu.bx, &bx, &by, &bw, &bh);
    evas_object_geometry_get(sd->parent, &px, &py, &pw, &ph);
-
+   if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS))
+     {
+        px = 0;
+        py = 0;
+     }
+   
    if (sd->menu_bar && !parent_it->parent)
      {
         x_p = x2;
@@ -160,6 +165,11 @@ _sizing_eval(Evas_Object *obj)
 
    evas_object_geometry_get(sd->location, NULL, NULL, &w_p, &h_p);
    evas_object_geometry_get(sd->parent, &x2, &y2, &w2, &h2);
+   if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS))
+     {
+        x2 = 0;
+        y2 = 0;
+     }
    evas_object_geometry_get(sd->bx, NULL, NULL, &bw, &bh);
 
    x_p = sd->xloc;

-- 


Reply via email to