From c9554c4946c221d112a13c87ebb6da45152282da Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 17 Jun 2007 05:29:06 +0000
Subject: [PATCH] attempt to fix zooming behavior when the user height matches
 the zoomed height

svn: r6681
---
 src/wxmac/src/mac/wx_frame.cc | 53 +++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/wxmac/src/mac/wx_frame.cc b/src/wxmac/src/mac/wx_frame.cc
index 1e8bbd75ed..98ca58952a 100644
--- a/src/wxmac/src/mac/wx_frame.cc
+++ b/src/wxmac/src/mac/wx_frame.cc
@@ -49,6 +49,7 @@ static OSStatus window_evt_handler(EventHandlerCallRef inHandlerCallRef,
 extern char *scheme_mac_spec_to_path(FSSpec *spec);
 
 static int os_x_post_tiger;
+static int zoom_window_hack = 0;
 
 //=============================================================================
 // Public constructors
@@ -317,7 +318,7 @@ static OSStatus window_evt_handler(EventHandlerCallRef inHandlerCallRef,
 	/* DragWindow is somehow confused by MrEd. It seems to confuse the struct
 	   and content regions, causing current bounds's height to become
 	   different from the original bound's height. To compensate,
-	   10.3 seems to ignore the hieght, but 10.4 doesn't. So we
+	   10.3 seems to ignore the height, but 10.4 doesn't. So we
 	   explicitly request the old size. */
 	Rect o, n;
 	GetEventParameter(inEvent, kEventParamPreviousBounds, typeQDRectangle, 
@@ -328,7 +329,7 @@ static OSStatus window_evt_handler(EventHandlerCallRef inHandlerCallRef,
 	n.right = n.left + (o.right - o.left);
 	SetEventParameter(inEvent, kEventParamCurrentBounds, typeQDRectangle, 
 			  sizeof(Rect), &n);
-      } else if (!(a & (kWindowBoundsChangeUserResize | kWindowBoundsChangeZoom))) {
+      } else if (!(a & (kWindowBoundsChangeUserResize | (zoom_window_hack ? 0 : kWindowBoundsChangeZoom)))) {
 	Rect n, s, c;
 	WindowRef w;
 
@@ -345,8 +346,17 @@ static OSStatus window_evt_handler(EventHandlerCallRef inHandlerCallRef,
 	     between the real content and structure regions. */
 	  int h, w, hdelta, wdelta;
 
-	  w = f->Width();
-	  h = f->Height();
+          GetEventParameter(inEvent, kEventParamCurrentBounds, typeQDRectangle, 
+			    NULL, sizeof(Rect), NULL, &n);
+	  
+          if (a & kWindowBoundsChangeZoom) {
+            h = n.bottom - n.top;
+            w = n.right - n.left;
+          } else {
+            w = f->Width();
+            h = f->Height();
+          }
+            
 	  {
 	    wxArea *parea;
 	    wxMargin pam;
@@ -356,8 +366,6 @@ static OSStatus window_evt_handler(EventHandlerCallRef inHandlerCallRef,
 	    hdelta = pam.Offset(wxVertical);
 	  }
 
-	  GetEventParameter(inEvent, kEventParamCurrentBounds, typeQDRectangle, 
-			    NULL, sizeof(Rect), NULL, &n);
 	  n.bottom = n.top + h - hdelta;
 	  n.right = n.left + w - wdelta;
 	  SetEventParameter(inEvent, kEventParamCurrentBounds, typeQDRectangle, 
@@ -612,6 +620,7 @@ void wxFrame::Maximize(Bool maximize)
       int oldWindowY = cWindowY;
       int oldWindowWidth = cWindowWidth;
       int oldWindowHeight = cWindowHeight;
+      int pam_dh, pam_dv;
       CGrafPtr theMacGrafPort;
       WindowPtr theMacWindow;
       Point size;
@@ -619,11 +628,33 @@ void wxFrame::Maximize(Bool maximize)
       theMacGrafPort = cMacDC->macGrafPort();
       theMacWindow = GetWindowFromPort(theMacGrafPort);
 
+      {
+        wxArea *parea;
+	wxMargin pam;
+
+	parea = PlatformArea();
+	pam = parea->Margin();
+
+        pam_dh = pam.Offset(wxHorizontal);
+        pam_dv = pam.Offset(wxVertical);
+      }
+
       if (maximize) {
 	Rect rect;
+
 	IsWindowInStandardState(theMacWindow, NULL, &rect);
 	size.h = (rect.right - rect.left);
 	size.v = (rect.bottom - rect.top);
+	
+        if (size.v + pam_dv == cWindowHeight) {
+          zoom_window_hack = 1;
+        }
+      } else {
+        Rect r;
+	GetWindowIdealUserState(theMacWindow, &r);
+        if ((r.bottom - r.top + pam_dv) == cWindowHeight) {
+          zoom_window_hack = 1;
+        }
       }
 
       ::ZoomWindowIdeal(theMacWindow, maximize ? inZoomOut : inZoomIn, &size);
@@ -632,16 +663,14 @@ void wxFrame::Maximize(Bool maximize)
 	/* MrEd somehow confuses Carbon about structure region versus content region.
 	   Subtract out the difference. */
 	Rect r;
-	wxArea *parea;
-	wxMargin pam;
-	parea = PlatformArea();
-	pam = parea->Margin();
 	GetWindowIdealUserState(theMacWindow, &r);
-	r.right -= pam.Offset(wxHorizontal);
-	r.bottom -= pam.Offset(wxVertical);
+	r.right -= pam_dh;
+	r.bottom -= pam_dv;
 	SetWindowIdealUserState(theMacWindow, &r);
       }
 
+      zoom_window_hack = 0;
+
       wxMacRecalcNewSize();
       
       if (cStatusPanel) {