← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~gamag/widelands/bug952404 into lp:widelands

 

Gabriel Margiani has proposed merging lp:~gamag/widelands/bug952404 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #952404 in widelands: "Window background moving when dragging windows out of the screen"
  https://bugs.launchpad.net/widelands/+bug/952404

For more details, see:
https://code.launchpad.net/~gamag/widelands/bug952404/+merge/97755

Fixes Bug#952404.
Shall/can I push such little changes
directly to truck in the Future?
-- 
https://code.launchpad.net/~gamag/widelands/bug952404/+merge/97755
Your team Widelands Developers is requested to review the proposed merge of lp:~gamag/widelands/bug952404 into lp:widelands.
=== modified file 'src/graphic/rendertarget.cc'
--- src/graphic/rendertarget.cc	2012-03-02 13:21:49 +0000
+++ src/graphic/rendertarget.cc	2012-03-15 21:29:30 +0000
@@ -223,6 +223,12 @@
 	int32_t srch = picture->get_h();
 
 	if (clip(r)) {
+		if (m_offset.x < 0)
+			ofs.x += abs(m_offset.x);
+
+		if (m_offset.y < 0)
+			ofs.y += abs(m_offset.y);
+
 		// Make sure the offset is within bounds
 		ofs.x = ofs.x % srcw;