rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=5e27a9962234154087929a6dcca4405c164d93a9

commit 5e27a9962234154087929a6dcca4405c164d93a9
Author: Andrii Kroitor <[email protected]>
Date:   Tue Sep 27 18:35:09 2016 +0300

    workspace: fix abort on menu dismiss
    
    Fixes T4671
---
 src/bin/ui/workspace/workspace.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index defcae5..a070e31 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -141,6 +141,7 @@ struct _Workspace_Data
    Workspace_Mode mode;
    Group2 *group;
    double zoom_factor;
+   Eina_Bool highlight_resize : 1;
    Eina_Bool markers : 1;
 };
 
@@ -1022,6 +1023,8 @@ _menu_cb(void *data,
    Eina_Bool sa, sr;
 
    if (ev->button != 3) return;
+   if (wd->highlight_resize) return;
+
    elm_menu_move(wd->menu.obj, ev->canvas.x, ev->canvas.y);
 
    if (!evas_object_visible_get(wd->menu.obj))
@@ -1323,6 +1326,7 @@ _groupview_hl_part_drag_start(void *data,
    Workspace_Data *wd = data;
    Groupview_HL_Event *event = event_info;
 
+   wd->highlight_resize = true;
    change = change_add(NULL);
    if (MIDDLE != event->hl_type)
      {
@@ -1435,6 +1439,7 @@ _groupview_hl_part_drag_stop(void *data,
      }
    change = NULL;
    shortcuts_object_check_pop(obj);
+   wd->highlight_resize = false;
 }
 
/******************************************************************************/
 

-- 


Reply via email to