From 52eeb9e32188296bb5a93fd316ee64a491842c60 Mon Sep 17 00:00:00 2001
From: Ross Wilson <rzzzwilson@gmail.com>
Date: Sun, 14 Jun 2015 19:15:37 +0700
Subject: [PATCH] Fixed 'keep square' code

---
 pymlac/test_pymlac_display.py | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pymlac/test_pymlac_display.py b/pymlac/test_pymlac_display.py
index b45de1a..c1fa28d 100755
--- a/pymlac/test_pymlac_display.py
+++ b/pymlac/test_pymlac_display.py
@@ -24,7 +24,8 @@ except ImportError:
 # Various demo constants
 ######
 
-DefaultAppSize = (200, 200)
+WindowTitleHeight = 22
+DefaultAppSize = (600, 600+WindowTitleHeight)
 
 ################################################################################
 # The main application frame
@@ -50,24 +51,36 @@ class TestFrame(wx.Frame):
 
         self.Bind(wx.EVT_SIZE, self.OnSize)
 
-        self.display.Drawlist([(0,0,1024,1024), (1024,0,0,1024)])
+        self.lock = False
+
+        self.Refresh()
+
+        self.display.Drawlist([(0,0,1023,1023), (1023,0,0,1023)])
 
     def OnSize(self, event):
         """Maintain square window."""
 
-        if deltaw is None:
+        if not self.lock:
+            self.lock = True
+            (w, h) = event.GetSize()
+            log('####: w=%d, h=%d' % (w, h))
+            size = min(w, h)
+            self.SetSize((size-WindowTitleHeight, size))
+            self.lock = False
 
+#        if deltaw is None:
+#
 #        (fwidth, fheight) = self.GetSize()                              
 #        log('####: fwidth=%d, fheight=%d' % (fwidth, fheight))
+#        fheight -= WindowTitleHeight
+#        fsize = min(fwidth, fheight)
+#        self.SetSize((fsize, fsize)) 
 #
 #        (pwidth, pheight) = self.display.GetClientSizeTuple()
-#        deltaw = fwidth - pwidth
-#        deltah = fheight - pheight
-#        log('####: deltaw=%d, deltah=%d' % (deltaw, deltah))
+#        pheight = fheight - WindowTitleHeight
+#        log('####: pwidth=%d, pheight=%d' % (pwidth, pheight))
 #
-#        psize = min(pwidth, pheight)
-#        fsize = (pwidth+deltaw, pheight+deltah)
-#        self.SetSize(fsize) 
+#        self.SetSize((pwidth, pheight)) 
 
         event.Skip()