|
From: Seth D. <set...@us...> - 2005-01-30 20:31:52
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11488/source Modified Files: shellwindow.c FrontierWinMain.c Log Message: The "maximize" (a.k.a. "zoom") button on outline-based windows (outline, script, menu, table), when user.prefs.flWinStandardMaximize is true now takes the status bar into account by calling getstatusbarheight(). shellwindow.c now includes FrontierWinMain.h, and getstatusbarheight() is now declared and defined extern rather than static. Fixed with the help of my brother-in-law, Art Pena. Index: FrontierWinMain.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/FrontierWinMain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FrontierWinMain.c 11 Jan 2005 22:48:04 -0000 1.5 --- FrontierWinMain.c 30 Jan 2005 20:31:40 -0000 1.6 *************** *** 1014,1018 **** ! static long getstatusbarheight () { RECT rectStatus; --- 1014,1019 ---- ! extern long getstatusbarheight () { ! /* 2005-01-30 SMD - made extern */ RECT rectStatus; Index: shellwindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellwindow.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shellwindow.c 11 Jan 2005 22:48:10 -0000 1.4 --- shellwindow.c 30 Jan 2005 20:31:40 -0000 1.5 *************** *** 53,56 **** --- 53,59 ---- #include "cancoon.h" + #ifdef WIN95VERSION + #include "FrontierWinMain.h" + #endif *************** *** 2474,2477 **** --- 2477,2484 ---- 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; |