If blitting from the root window, take the multi-monitor offset into

2005-05-26  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkdrawable-win32.c (_gdk_win32_blit): If blitting
	from the root window, take the multi-monitor offset into
	account. (#305511)

diff --git a/ChangeLog b/ChangeLog
index 2c0e8d37ff02043d9017780189857bc12b6f7b78..bf7bc73f2365a81b5f1f756298aac67328cd1999 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-26  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * demos/gtk-demo/appwindow.c (do_appwindow): Set the window

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2c0e8d37ff02043d9017780189857bc12b6f7b78..bf7bc73f2365a81b5f1f756298aac67328cd1999 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-05-26  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * demos/gtk-demo/appwindow.c (do_appwindow): Set the window

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2c0e8d37ff02043d9017780189857bc12b6f7b78..bf7bc73f2365a81b5f1f756298aac67328cd1999 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-05-26  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * 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 a7959733dc1386d6ae66b4479045165c92d6b434..2d45a40f51b0502bc91a4b563e4f153315da45e2 100644 (file)
--- 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))