From e7c9e7d8de6105fc1822dde6cffa5e0cb163b3eb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 26 May 2005 07:56:00 +0000 Subject: [PATCH] If blitting from the root window, take the multi-monitor offset into 2005-05-26 Tor Lillqvist * gdk/win32/gdkdrawable-win32.c (_gdk_win32_blit): If blitting from the root window, take the multi-monitor offset into account. (#305511) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/win32/gdkdrawable-win32.c | 10 ++++++++++ 4 files changed, 28 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2c0e8d37ff..bf7bc73f23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-05-26 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (_gdk_win32_blit): If blitting + from the root window, take the multi-monitor offset into + account. (#305511) + 2005-05-25 Matthias Clasen * demos/gtk-demo/appwindow.c (do_appwindow): Set the window diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2c0e8d37ff..bf7bc73f23 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-05-26 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (_gdk_win32_blit): If blitting + from the root window, take the multi-monitor offset into + account. (#305511) + 2005-05-25 Matthias Clasen * demos/gtk-demo/appwindow.c (do_appwindow): Set the window diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2c0e8d37ff..bf7bc73f23 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-05-26 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (_gdk_win32_blit): If blitting + from the root window, take the multi-monitor offset into + account. (#305511) + 2005-05-25 Matthias Clasen * demos/gtk-demo/appwindow.c (do_appwindow): Set the window diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c index a7959733dc..2d45a40f51 100644 --- a/gdk/win32/gdkdrawable-win32.c +++ b/gdk/win32/gdkdrawable-win32.c @@ -1731,6 +1731,16 @@ _gdk_win32_blit (gboolean use_fg_bg, xdest, ydest, use_fg_bg)); + /* If blitting from the root window, take the multi-monitor offset + * into account. + */ + if (src == ((GdkWindowObject *)_gdk_root)->impl) + { + GDK_NOTE (MISC, g_print ("... offsetting src coords\n")); + xsrc -= _gdk_offset_x; + ysrc -= _gdk_offset_y; + } + draw_impl = (GdkDrawableImplWin32 *) drawable; if (GDK_IS_DRAWABLE_IMPL_WIN32 (src))