discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=157702c6d1932902cdee6cb5968b5abd9478a9ed

commit 157702c6d1932902cdee6cb5968b5abd9478a9ed
Author: Mike Blumenkrantz <[email protected]>
Date:   Wed May 7 16:04:48 2014 -0400

    block shelf autoshow if fullscreen client is present
    
    T1232
---
 src/bin/e_shelf.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 8c884b1..1cae998 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -1684,11 +1684,17 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
    if (type == E_EVENT_ZONE_EDGE_MOVE)
      {
         E_Event_Zone_Edge *ev;
+        E_Desk *desk;
+        Eina_List *l;
+        E_Client *ec;
         int show = 0;
 
         ev = event;
         if (es->zone != ev->zone) return ECORE_CALLBACK_PASS_ON;
         if (!_e_shelf_on_current_desk(es, ev)) return ECORE_CALLBACK_PASS_ON;
+        desk = e_desk_current_get(ev->zone);
+        EINA_LIST_FOREACH(desk->fullscreen_clients, l, ec)
+          if (evas_object_visible_get(ec->frame)) return ECORE_CALLBACK_RENEW;
 
         ev->x -= es->zone->x, ev->y -= es->zone->y;
         switch (es->gadcon->orient)

-- 


Reply via email to