From: Owen Taylor Date: Tue, 3 Dec 2002 22:54:09 +0000 (+0000) Subject: Fix wrong sign for queued translation. (Found by Chris Blizzard, #100274) X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=a58708c4844ffe1d37f3dcdce6fb62818380f530 Fix wrong sign for queued translation. (Found by Chris Blizzard, #100274) Tue Dec 3 17:47:24 2002 Owen Taylor * gdk/x11/gdkgeometry-x11.c (gdk_window_guffaw_scroll): Fix wrong sign for queued translation. (Found by Chris Blizzard, #100274) --- diff --git a/ChangeLog b/ChangeLog index 334fe71c7..5867638ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Dec 3 17:47:24 2002 Owen Taylor + + * gdk/x11/gdkgeometry-x11.c (gdk_window_guffaw_scroll): Fix wrong + sign for queued translation. (Found by Chris Blizzard, + #100274) + 2002-12-03 Matthias Clasen Moveresize emulation for all edges. (#52833) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 334fe71c7..5867638ce 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Dec 3 17:47:24 2002 Owen Taylor + + * gdk/x11/gdkgeometry-x11.c (gdk_window_guffaw_scroll): Fix wrong + sign for queued translation. (Found by Chris Blizzard, + #100274) + 2002-12-03 Matthias Clasen Moveresize emulation for all edges. (#52833) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 334fe71c7..5867638ce 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Tue Dec 3 17:47:24 2002 Owen Taylor + + * gdk/x11/gdkgeometry-x11.c (gdk_window_guffaw_scroll): Fix wrong + sign for queued translation. (Found by Chris Blizzard, + #100274) + 2002-12-03 Matthias Clasen Moveresize emulation for all edges. (#52833) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 334fe71c7..5867638ce 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Dec 3 17:47:24 2002 Owen Taylor + + * gdk/x11/gdkgeometry-x11.c (gdk_window_guffaw_scroll): Fix wrong + sign for queued translation. (Found by Chris Blizzard, + #100274) + 2002-12-03 Matthias Clasen Moveresize emulation for all edges. (#52833) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 334fe71c7..5867638ce 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Dec 3 17:47:24 2002 Owen Taylor + + * gdk/x11/gdkgeometry-x11.c (gdk_window_guffaw_scroll): Fix wrong + sign for queued translation. (Found by Chris Blizzard, + #100274) + 2002-12-03 Matthias Clasen Moveresize emulation for all edges. (#52833) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 334fe71c7..5867638ce 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Dec 3 17:47:24 2002 Owen Taylor + + * gdk/x11/gdkgeometry-x11.c (gdk_window_guffaw_scroll): Fix wrong + sign for queued translation. (Found by Chris Blizzard, + #100274) + 2002-12-03 Matthias Clasen Moveresize emulation for all edges. (#52833) diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c index 330430965..693a0cc51 100644 --- a/gdk/x11/gdkgeometry-x11.c +++ b/gdk/x11/gdkgeometry-x11.c @@ -331,8 +331,8 @@ gdk_window_guffaw_scroll (GdkWindow *window, gdk_window_tmp_unset_bg (window); - if (d_xoffset < 0 || d_yoffset < 0) - gdk_window_queue_translation (window, MIN (d_xoffset, 0), MIN (d_yoffset, 0)); + if (dx > 0 || dy > 0) + gdk_window_queue_translation (window, MAX (dx, 0), MAX (dy, 0)); gdk_window_set_static_gravities (window, TRUE); @@ -357,8 +357,8 @@ gdk_window_guffaw_scroll (GdkWindow *window, GDK_WINDOW_XID (window), new_position.x - d_xoffset, new_position.y - d_yoffset); - if (d_xoffset > 0 || d_yoffset > 0) - gdk_window_queue_translation (window, MAX (d_xoffset, 0), MAX (d_yoffset, 0)); + if (dx < 0 || dy < 0) + gdk_window_queue_translation (window, MIN (dx, 0), MIN (dy, 0)); XMoveResizeWindow (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window),