AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtknotebook: avoid tab dnd from content

Browse Source 
Before commit 6c1bee2377 we were setting an attribute of GtkNotebook
to track the pressed button if the pressed button happened on the
tab itself.
Later in the motion handling code we were checking whether the private
pressed button attribute was set or not in order to handle a tab dnd
or not.

In commit 6c1bee2377 the code changed and set the pressed button
variable unconditionally, which means, a motion event from within the
tab content triggered a tab reordering.

This happened only if the children hierarchy have a widget that bubbles
up both button press event, which sets the private pressed button
attribute; and motion events, which started the tab dnd checking the
private pressed button attribute.
A widget that experienced the regression was GtkListBox.

In order to fix it, set the button pressed variable only when it press
the tab itself, not the content.

https://bugzilla.gnome.org/show_bug.cgi?id=764395
This commit is contained in:
Carlos Soriano 2016-05-02 10:19:12 +02:00
parent bab628beb2
commit ddb0740a21
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtknotebook.c
View File

@ -2747,8 +2747,6 @@ gtk_notebook_button_press (GtkWidget *widget,
if (event->button != GDK_BUTTON_PRIMARY)
return FALSE;
priv->pressed_button = event->button;
if ((tab = get_tab_at_pos (notebook, x, y)) != NULL)
{
GtkAllocation allocation;
@ -2767,6 +2765,8 @@ gtk_notebook_button_press (GtkWidget *widget,
/* save press to possibly begin a drag */
if (page->reorderable || page->detachable)
{
priv->pressed_button = event->button;
priv->mouse_x = x;
priv->mouse_y = y;