[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1253
Date       : Mon Jun  5 16:29:25 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camresource.cpp
   M /Trunk/XaraLX/wxOil/dlgmgr.cpp

Fixed splash screen so it doesn't stay on top
Tidied up ScrollKernelRenderedGadget even though it doesn't fix the underlying problem


Diff:
Index: Trunk/XaraLX/wxOil/camresource.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camresource.cpp	(revision 1252)
+++ Trunk/XaraLX/wxOil/camresource.cpp	(revision 1253)
@@ -1786,7 +1786,7 @@
 		wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT,
 		0, NULL, -1, wxDefaultPosition, wxDefaultSize,
 		wxNO_BORDER
-#if !defined (_DEBUG)
+#if 0 && !defined (_DEBUG)
 		|wxSTAY_ON_TOP // Only stay on top in non-debug builds - too annoying for preinit debugging
 #endif
 		  );
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1252)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1253)
@@ -5321,8 +5321,9 @@
 			wxRect		BaseRect;
 			BaseRect.x		= RectToScroll->lo.x / PixelSize;
 			BaseRect.width	= ( RectToScroll->hi.x - RectToScroll->lo.x ) / PixelSize;
-			BaseRect.y		= ( ExtraInfo.dy - RectToScroll->lo.y ) / PixelSize;
-			BaseRect.height	= ( ExtraInfo.dy + RectToScroll->lo.y - RectToScroll->hi.y ) / PixelSize;
+			BaseRect.y		= ( ExtraInfo.dy - RectToScroll->hi.y ) / PixelSize;
+//			BaseRect.height	= ( ExtraInfo.dy + RectToScroll->lo.y - RectToScroll->hi.y ) / PixelSize;
+			BaseRect.height	= ( RectToScroll->hi.y - RectToScroll->lo.y ) / PixelSize;
 
 			// Copy the scroll area contents with a blit, and invalidate the 'hole'
 			pWinToScroll->ScrollWindow( -ScrollDX, -ScrollDY, &BaseRect );


Xara