[Xfce4-commits] <xfwm4:ochosi/tabwin> Fix mouse interactions with tabwin buttons

[Simon Steinbeiss]

Updating branch refs/heads/ochosi/tabwin
         to 4d7b5dc6fb070774ee464f6549d15c809f260412 (commit)
       from 142904be056f9d469726848c61d8ff33e97fae4c (commit)

commit 4d7b5dc6fb070774ee464f6549d15c809f260412
Author: cedric <cedl38 at gmail.com>
Date:   Sun Dec 1 01:36:11 2013 +0100

    Fix mouse interactions with tabwin buttons
    
    Signed-off-by: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>

 src/tabwin.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tabwin.c b/src/tabwin.c
index c25a403..e8713b8 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -673,13 +673,17 @@ tabwinChange2Selected (Tabwin *t, GList *selected)
 
             if (c != NULL)
             {
-                if (c->screen_info->params->cycle_tabwin_mode == STANDARD_ICON_GRID)
+                /* don't clear label if mouse is inside the previously
+                 * selected button */
+                if (c->screen_info->params->cycle_tabwin_mode == STANDARD_ICON_GRID
+                    && window_button != t->hovered)
                 {
                     gtk_label_set_text (GTK_LABEL (buttonlabel), "");
                 }
 
                 if (c == t->selected->data)
                 {
+                    gtk_widget_grab_focus (window_button);
                     tabwinSetSelected (tbw, window_button, buttonlabel);
                     gtk_widget_queue_draw (GTK_WIDGET(tbw));
                 }