Changeset 6306f2f in sasview

Timestamp:

May 8, 2012 12:16:46 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

8fcf331

Parents:

2ad3601

Message:

fixing the size problem for mac

Location:

sansguiframe/src/sans/guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• startup_configuration.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -3299 +3299 @@
         for plot in self.plot_panels.values():
             plot.on_kill_focus(None)
-
+    
+    def get_window_size(self):
+        """
+        Get window size 
+        
+        :return size: tuple
+        """
+        width, height = self.GetSizeTuple()
+        if not IS_WIN:
+            # Subtract toolbar height to get real window side
+            if self._toolbar.IsShown():
+                height -= 45
+        return (width, height)
+            
     def _onDrawIdle(self, *args, **kwargs):
         """
@@ -3514 +3527 @@
         
         # If dual screen registered as 1 screen. Make width half.
-        if displayWidth > (displayHeight*2):
-            if (customWidth == displayWidth):
-                customWidth = displayWidth/2
-            # and set the position to be the corner of the screen.
-            posX = 0
-            posY = 0
-            
-        # Make the position the middle of the screen. (Not 0,0)
-        else:
-            posX = (displayWidth - customWidth)/2
-            posY = (displayHeight - customHeight)/2
+        # MAC just follows the default behavior of pos
+        if IS_WIN:
+            if displayWidth > (displayHeight*2):
+                if (customWidth == displayWidth):
+                    customWidth = displayWidth/2
+                # and set the position to be the corner of the screen.
+                posX = 0
+                posY = 0
+                
+            # Make the position the middle of the screen. (Not 0,0)
+            else:
+                posX = (displayWidth - customWidth)/2
+                posY = (displayHeight - customHeight)/2
         
         # Return the suggested position and size for the application frame.    

sansguiframe/src/sans/guiframe/startup_configuration.py

@@ -120 +120 @@
             gui_pw, gui_ph = (0, 0)
         else:
-            gui_pw, gui_ph = self.parent.GetSizeTuple()
+            gui_pw, gui_ph = self.parent.get_window_size()
         self.current_string['GUIFRAME_WIDTH'] = gui_pw
         self.current_string['GUIFRAME_HEIGHT'] = gui_ph