callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkWindow: Don't needlessly resize popovers

Browse Source 
Check whether the given popover even changed size in
_gtk_window_set_popover_position. If not, just move its GdkWindow
without calling gtk_widget_queue_resize. Using popover_get_rect here is
still relatively costly, but popover_size_allocate would be doing that
anyway.

https://bugzilla.gnome.org/show_bug.cgi?id=755435
This commit is contained in:
Timm Bäder
2015-09-23 08:56:56 +02:00
parent eb8a64982e
commit b92213e49d
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkwindow.c
View File

@ -11904,7 +11904,8 @@ _gtk_window_set_popover_position (GtkWindow *window,
GtkPositionType pos, GtkPositionType pos,
const cairo_rectangle_int_t *rect) const cairo_rectangle_int_t *rect)
{ {
gboolean need_resize = TRUE; gboolean need_resize;
gboolean need_move;
GtkWindowPopover *data; GtkWindowPopover *data;
g_return_if_fail (GTK_IS_WINDOW (window)); g_return_if_fail (GTK_IS_WINDOW (window));
@ -11919,12 +11920,16 @@ _gtk_window_set_popover_position (GtkWindow *window,
gtk_widget_get_name (GTK_WIDGET (window))); gtk_widget_get_name (GTK_WIDGET (window)));
return; return;
} }
else
{
if (data->pos == pos && /* Don't queue a resize if the position as well as the size are the same */
memcmp (&data->rect, rect, sizeof (cairo_rectangle_int_t)) == 0) need_move = data->pos != pos ||
need_resize = FALSE; data->rect.x != rect->x ||
} data->rect.y != rect->y;
need_resize = data->pos != pos ||
data->rect.width != rect->width ||
data->rect.height != rect->height;
data->rect = *rect; data->rect = *rect;
data->pos = pos; data->pos = pos;
@ -11936,7 +11941,15 @@ _gtk_window_set_popover_position (GtkWindow *window,
} }
if (need_resize) if (need_resize)
gtk_widget_queue_resize (popover); {
gtk_widget_queue_resize (popover);
}
else if (need_move)
{
cairo_rectangle_int_t new_size;
popover_get_rect (data, window, &new_size);
gdk_window_move (data->window, new_size.x, new_size.y);
}
} }
void void