SF.net SVN: frontierkernel: [1172] Frontier/trunk/Common/source

[<set...@us...>]

Revision: 1172
Author:   sethdill
Date:     2006-03-28 18:19:25 -0800 (Tue, 28 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1172&view=rev

Log Message:
-----------
Now we subtract the statusbar's height from the available space before figuring out the window's zoomed height. With the old approach, we always subtracted the statusbar's height from the zoomed height, which always made the window a little too small.

Modified Paths:
--------------
    Frontier/trunk/Common/source/quickdraw.c
    Frontier/trunk/Common/source/shellwindow.c
Modified: Frontier/trunk/Common/source/quickdraw.c
===================================================================
--- Frontier/trunk/Common/source/quickdraw.c	2006-03-29 02:00:53 UTC (rev 1171)
+++ Frontier/trunk/Common/source/quickdraw.c	2006-03-29 02:19:25 UTC (rev 1172)
@@ -47,6 +47,7 @@
 
 
 #ifdef WIN95VERSION
+	#include "FrontierWinMain.h"  // 2006-03-28 SMD, for getstatusbarheight()
 	HWND getcurrentwindow();
 	HBRUSH getcurrentbrush();
 	extern HINSTANCE hInst;
@@ -2452,11 +2453,13 @@
 	getlocalwindowrect (shellframewindow, r);
 
 	localtoglobalrect (shellframewindow, r);
+	
+	(*r).bottom -= getstatusbarheight();  // 2006-03-28 SMD
 #endif
 	} /*getdesktopbounds*/
 
 
-static boolean constraintorect (Rect *rconstrained, Rect rcontains, boolean flcenter) {
+extern boolean constraintorect (Rect *rconstrained, Rect rcontains, boolean flcenter) {
 	
 	/*
 	9/15/91 dmb: make sure that rconstrained fits within rcontains.

Modified: Frontier/trunk/Common/source/shellwindow.c
===================================================================
--- Frontier/trunk/Common/source/shellwindow.c	2006-03-29 02:00:53 UTC (rev 1171)
+++ Frontier/trunk/Common/source/shellwindow.c	2006-03-29 02:19:25 UTC (rev 1172)
@@ -2476,10 +2476,6 @@
 		
 		insetrect (&rzoom, 3, 3);
 		
-		#ifdef WIN95VERSION
-			rzoom.bottom -= getstatusbarheight();  /* 2005-01-30 SMD (and arp) */
-		#endif
-		
 		if ((rfull.right - rfull.left) <= (rzoom.right - rzoom.left)) /*can fit full horiz*/
 			flscrollleft = true;
 		
@@ -2493,7 +2489,7 @@
 			//old code
 			//(**hstatedata).stdState = rzoom;
 		#else
-			(**h).zoomedrect = rwindow;
+			(**h).zoomedrect = rzoom;  /* 2006-03-28 SMD fixed, was rwindow */
 		#endif
 		}
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.