[gtk+] gdkwindow: Remove extra arguments from process_updates_recurse_helper
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdkwindow: Remove extra arguments from process_updates_recurse_helper
- Date: Mon, 23 Jun 2014 20:45:33 +0000 (UTC)
commit e67e8ebb301368449b417ec11a6a6323257e09cd
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Jun 23 16:15:48 2014 -0400
gdkwindow: Remove extra arguments from process_updates_recurse_helper
These can easily be calculated inside the function.
gdk/gdkwindow.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index db7b640..29019ad 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -3239,8 +3239,7 @@ gdk_window_add_damage (GdkWindow *toplevel,
static void
_gdk_window_process_updates_recurse_helper (GdkWindow *window,
- cairo_region_t *expose_region,
- int dx, int dy)
+ cairo_region_t *expose_region)
{
GdkWindow *child;
cairo_region_t *clipped_expose_region;
@@ -3253,7 +3252,10 @@ _gdk_window_process_updates_recurse_helper (GdkWindow *window,
return;
clipped_expose_region = cairo_region_copy (expose_region);
- cairo_region_translate (clipped_expose_region, dx, dy);
+
+ if (!gdk_window_has_impl (window))
+ cairo_region_translate (clipped_expose_region, -window->x, -window->y);
+
cairo_region_intersect (clipped_expose_region, window->clip_region);
if (cairo_region_is_empty (clipped_expose_region))
@@ -3305,7 +3307,7 @@ _gdk_window_process_updates_recurse_helper (GdkWindow *window,
/* Client side child, expose */
if (child->impl == window->impl)
- _gdk_window_process_updates_recurse_helper ((GdkWindow *)child, clipped_expose_region, -child->x,
-child->y);
+ _gdk_window_process_updates_recurse_helper ((GdkWindow *)child, clipped_expose_region);
}
g_list_free_full (children, g_object_unref);
@@ -3318,7 +3320,7 @@ void
_gdk_window_process_updates_recurse (GdkWindow *window,
cairo_region_t *expose_region)
{
- _gdk_window_process_updates_recurse_helper (window, expose_region, 0, 0);
+ _gdk_window_process_updates_recurse_helper (window, expose_region);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]