From e1acc237ed39bfe49929579cc99a507ebd3cc84d Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Mon, 25 Jun 2012 12:10:31 +0000
Subject: [PATCH] fix some remaining shelf autohide bugs related to shelves
 drawn on the container

SVN revision: 72804
---
 src/bin/e_gadcon.c |  4 ++++
 src/bin/e_shelf.c  | 26 +++++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 7d2d48e3b..aea4a25bf 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -482,6 +482,7 @@ e_gadcon_unpopulate(E_Gadcon *gc)
         gcc = eina_list_data_get(gc->clients);
         if (gcc->menu)
           {
+             if (gcc->gadcon->shelf && (gcc->menu == gcc->gadcon->shelf->menu)) gcc->gadcon->shelf->menu = NULL;
              e_menu_post_deactivate_callback_set(gcc->menu, NULL, NULL);
              e_object_del(E_OBJECT(gcc->menu));
              gcc->menu = NULL;
@@ -1692,6 +1693,7 @@ _e_gadcon_client_free(E_Gadcon_Client *gcc)
                                     _e_gadcon_client_del_hook);
    if (gcc->menu)
      {
+        if (gcc->gadcon->shelf && (gcc->menu == gcc->gadcon->shelf->menu)) gcc->gadcon->shelf->menu = NULL;
         e_menu_post_deactivate_callback_set(gcc->menu, NULL, NULL);
         e_object_del(E_OBJECT(gcc->menu));
         gcc->menu = NULL;
@@ -2662,6 +2664,7 @@ _e_gadcon_client_cb_menu_post(void *data, E_Menu *m __UNUSED__)
    if (!(gcc = data)) return;
    if (gcc->gadcon) e_gadcon_locked_set(gcc->gadcon, 0);
    if (!gcc->menu) return;
+   if (gcc->gadcon->shelf && (gcc->menu == gcc->gadcon->shelf->menu)) gcc->gadcon->shelf->menu = NULL;
    e_object_del(E_OBJECT(gcc->menu));
    gcc->menu = NULL;
 }
@@ -2700,6 +2703,7 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj
         e_menu_post_deactivate_callback_set(m, _e_gadcon_client_cb_menu_post,
                                             gcc);
         gcc->menu = m;
+        if (gcc->gadcon->shelf) gcc->gadcon->shelf->menu = m;
 
         e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, &cw, &ch);
         zone = gcc->gadcon->zone;
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 199670f77..d7f5f7dab 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -17,6 +17,7 @@ static void         _e_shelf_cb_urgent_show(void *data);
 static void         _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static Eina_Bool    _e_shelf_cb_mouse_in(void *data, int type, void *event);
 static Eina_Bool    _e_shelf_cb_mouse_out(void *data, int type, void *event);
+static void          _e_shelf_cb_mouse_out2(E_Shelf *es, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Out *ev);
 static int          _e_shelf_cb_id_sort(const void *data1, const void *data2);
 static Eina_Bool    _e_shelf_cb_hide_animator(void *data);
 static Eina_Bool    _e_shelf_cb_hide_animator_timer(void *data);
@@ -137,6 +138,8 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
                                    ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _e_shelf_cb_mouse_in, es));
    es->handlers = eina_list_append(es->handlers,
                                    ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_shelf_cb_mouse_out, es));
+   if (!popup)
+     evas_object_event_callback_add(es->o_event, EVAS_CALLBACK_MOUSE_OUT, (Evas_Object_Event_Cb)_e_shelf_cb_mouse_out2, es);
 
    es->o_base = edje_object_add(es->evas);
    es->name = eina_stringshare_add(name);
@@ -1482,19 +1485,19 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
         Ecore_X_Event_Mouse_In *ev;
 
         ev = event;
-        if (!es->popup) return ECORE_CALLBACK_PASS_ON;
-        if (ev->win == es->popup->evas_win)
-          {
-             edje_object_signal_emit(es->o_base, "e,state,focused", "e");
-             e_shelf_toggle(es, 1);
-          }
-        else if (!es->hidden)
+        if ((!es->hidden) && (!es->menu))
           {
              int x, y, w, h;
              evas_object_geometry_get(es->o_event, &x, &y, &w, &h);
              if (!E_INSIDE(ev->x, ev->y, x, y, w, h))
                e_shelf_toggle(es, 0);
           }
+        if (!es->popup) return ECORE_CALLBACK_PASS_ON;
+        if (ev->win == es->popup->evas_win)
+          {
+             edje_object_signal_emit(es->o_base, "e,state,focused", "e");
+             e_shelf_toggle(es, 1);
+          }
      }
    else if (type == ECORE_EVENT_MOUSE_MOVE)
      {
@@ -1511,6 +1514,15 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
    return ECORE_CALLBACK_PASS_ON;
 }
 
+static void
+_e_shelf_cb_mouse_out2(E_Shelf *es, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, Evas_Event_Mouse_Out *ev)
+{
+   int x, y, w, h;
+   evas_object_geometry_get(es->o_event, &x, &y, &w, &h);
+   if (!E_INSIDE(ev->output.x, ev->output.y, x, y, w, h))
+     e_shelf_toggle(es, 0);
+}
+
 static Eina_Bool
 _e_shelf_cb_mouse_out(void *data, int type, void *event)
 {