Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

window: Don't queue resizes when inhibiting resizes

Browse Source 
Since the frame clock, the inhibit happens on the GDK level, so this
code is no longer necessary.
This commit is contained in:
Benjamin Otte
2015-10-01 22:36:34 +02:00
parent 99c52058c6
commit 1a59583fda
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkcontainer.c
View File

@@ -1670,9 +1670,6 @@ gtk_container_destroy (GtkWidget *widget)
GtkContainer *container = GTK_CONTAINER (widget);
GtkContainerPrivate *priv = container->priv;
if (priv->resize_pending)
_gtk_container_dequeue_resize_handler (container);
if (priv->restyle_pending)
priv->restyle_pending = FALSE;
@@ -1901,15 +1898,6 @@ gtk_container_remove (GtkContainer *container,
g_object_unref (container);
}
void
_gtk_container_dequeue_resize_handler (GtkContainer *container)
{
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (container->priv->resize_pending);
container->priv->resize_pending = FALSE;
}
/**
* gtk_container_set_resize_mode:
* @container: a #GtkContainer

9
gtk/gtkwindow.c
View File

@@ -7544,7 +7544,7 @@ gtk_window_configure_event (GtkWidget *widget,
priv->configure_notify_received = TRUE;
gtk_widget_queue_resize (widget);
gtk_widget_queue_allocate (widget);
gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
return TRUE;
@@ -9486,13 +9486,6 @@ gtk_window_move_resize (GtkWindow *window)
* FIXME: we should also dequeue the pending redraws here, since
* we handle those ourselves upon ->configure_notify_received==TRUE.
*/
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (gtk_container_get_resize_mode (container) == GTK_RESIZE_QUEUE)
{
gtk_widget_queue_resize_no_redraw (widget);
_gtk_container_dequeue_resize_handler (container);
}
G_GNUC_END_IGNORE_DEPRECATIONS;
}
}
else