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

scrolledwindow: Don't displace invalidation by the widget allocation

Browse Source 
This was left unmodified when GtkScrolledWindow was made a windowed widget.
Displacing here by the widget allocation is not necessary anymore, since
we are invalidating the window set at these coordinates.

This patch is a simplification of a previous one by Timm Bäder.

https://bugzilla.gnome.org/show_bug.cgi?id=742243
This commit is contained in:
Carlos Garnacho 2015-01-16 13:18:09 +01:00
parent cbabb2e6ff
commit dc952e3d94
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkscrolledwindow.c
View File

@ -752,19 +752,15 @@ scrolled_window_drag_begin_cb (GtkScrolledWindow *scrolled_window,
static void static void
gtk_scrolled_window_invalidate_overshoot (GtkScrolledWindow *scrolled_window) gtk_scrolled_window_invalidate_overshoot (GtkScrolledWindow *scrolled_window)
{ {
GtkAllocation child_allocation, allocation; GtkAllocation child_allocation;
gint overshoot_x, overshoot_y; gint overshoot_x, overshoot_y;
GdkRectangle rect; GdkRectangle rect;
if (!_gtk_scrolled_window_get_overshoot (scrolled_window, &overshoot_x, &overshoot_y)) if (!_gtk_scrolled_window_get_overshoot (scrolled_window, &overshoot_x, &overshoot_y))
return; return;
gtk_widget_get_allocation (GTK_WIDGET (scrolled_window), &allocation);
gtk_scrolled_window_relative_allocation (GTK_WIDGET (scrolled_window), gtk_scrolled_window_relative_allocation (GTK_WIDGET (scrolled_window),
&child_allocation); &child_allocation);
child_allocation.x += allocation.x;
child_allocation.y += allocation.y;
if (overshoot_x != 0) if (overshoot_x != 0)
{ {
if (overshoot_x < 0) if (overshoot_x < 0)