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

notebook: Properly hide drag window

Browse Source 
Move code to properly reinsert the tab label to where it belongs.
The if has the distinction between reparented-to-dnd-window and
just-changed-the-gdk-window-to-draw-to right there.

https://bugzilla.gnome.org/show_bug.cgi?id=760754
This commit is contained in:
Benjamin Otte 2016-01-20 17:20:03 +01:00
parent 099662998a
commit c162a0cca8
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtknotebook.c
View File

@ -2973,8 +2973,16 @@ hide_drag_window (GtkNotebook *notebook,
{
GtkWidget *widget = GTK_WIDGET (notebook);
if (gtk_widget_get_window (page->tab_label) != gtk_widget_get_window (widget) ||
!NOTEBOOK_IS_TAB_LABEL_PARENT (notebook, page))
if (!NOTEBOOK_IS_TAB_LABEL_PARENT (notebook, page))
{
g_object_ref (page->tab_label);
gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (page->tab_label)), page->tab_label);
gtk_css_node_set_parent (gtk_widget_get_css_node (page->tab_label),
gtk_css_gadget_get_node (page->gadget));
gtk_widget_set_parent (page->tab_label, GTK_WIDGET (notebook));
g_object_unref (page->tab_label);
}
else if (gtk_widget_get_window (page->tab_label) != gtk_widget_get_window (widget))
{
gtk_widget_set_child_visible (page->tab_label, FALSE);
gtk_widget_unrealize (page->tab_label);
@ -3034,15 +3042,6 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
hide_drag_window (notebook, priv, page);
}
else
{
g_object_ref (page->tab_label);
gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (page->tab_label)), page->tab_label);
gtk_css_node_set_parent (gtk_widget_get_css_node (page->tab_label),
gtk_css_gadget_get_node (page->gadget));
gtk_widget_set_parent (page->tab_label, GTK_WIDGET (notebook));
g_object_unref (page->tab_label);
}
priv->operation = DRAG_OPERATION_NONE;