[Xfce4-commits] [xfce/xfce4-panel] 01/01: tasklist: Don't show actionsmenu in grouped windows (Bug #15622)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-panel.

commit 0ad33088dc56673a652ea0b5919ba0e3b3b560d5
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Jun 24 22:37:26 2019 +0200

    tasklist: Don't show actionsmenu in grouped windows (Bug #15622)
    
    Previously right-clicking a window in a group (which is a menuitem) the
    regular wnck actions menu would be shown and allow you to interact with
    the application/window in question. Unfortunately the two menus stacked
    on top of each other resulted in a bug, which caused me to 1)
    investigate and 2) decide that there are no other contexts in which we
    allow right-click menus in regular menus.
    
    The new behavior is simply that right-clicks will be treated like
    left-clicks and activate the window in the menu. If you want to interact
    with one of the windows in the group, you can simply right-click the
    group button in the panel and get the regular arrow sub-menus, which are
    much more discoverable.
---
 plugins/tasklist/tasklist-widget.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index 8d44faa..296093e 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -2905,7 +2905,7 @@ xfce_tasklist_button_button_press_event (GtkWidget         *button,
       return TRUE;
     }
 
-  if (event->button == 3)
+  if (event->button == 3 && !GTK_IS_MENU_ITEM (button))
     {
       menu = wnck_action_menu_new (child->window);
       g_signal_connect (G_OBJECT (menu), "selection-done",
@@ -2921,6 +2921,11 @@ xfce_tasklist_button_button_press_event (GtkWidget         *button,
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
       return TRUE;
     }
+  else if (event->button == 3 && GTK_IS_MENU_ITEM (button))
+    {
+      xfce_tasklist_button_activate (child, event->time);
+      return FALSE;
+    }
 
   return FALSE;
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.