Changeset 2ad3601 in sasview

Timestamp:

May 7, 2012 7:49:21 PM (12 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:

6306f2f

Parents:

3764dbd7

Message:

starup_config supports full max screen size

Location:

sansguiframe/src/sans/guiframe

Files:

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

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -3349 +3349 @@
         When initialised
         """
-        pos, size = self.window_placement((GUIFRAME_WIDTH, 
+        pos, size, self.is_max = self.window_placement((GUIFRAME_WIDTH, 
                                            GUIFRAME_HEIGHT))     
         self.frame = ViewerFrame(parent=None, 
@@ -3385 +3385 @@
   
         return True
+    
+    def maximize_win(self):
+        """
+        Maximize the window after the frame shown
+        """
+        if self.is_max:
+            if self.frame.IsShown():
+                # Max window size
+                self.frame.Maximize(self.is_max)
 
     def open_file(self):
@@ -3472 +3481 @@
         placed on the left side of the screen.
         """
-        
+        is_maximized = False
         # Get size of screen without 
         for screenCount in range(wx.Display().GetCount()):
@@ -3484 +3493 @@
         
         # If the custom size is default, set 90% of the screen size
-        if customWidth < 0 and customHeight < 0:
+        if customWidth <= 0 and customHeight <= 0:
+            if customWidth == 0 and customHeight == 0:
+                is_maximized = True
             customWidth = displayWidth * 0.9
             customHeight = displayHeight * 0.9
@@ -3516 +3527 @@
         
         # Return the suggested position and size for the application frame.    
-        return (posX, posY), (customWidth, customHeight)
+        return (posX, posY), (customWidth, customHeight), is_maximized
 
     
@@ -3562 +3573 @@
         self.frame.Show(True)
         event.Skip()
+        self.maximize_win()
 
 if __name__ == "__main__": 

sansguiframe/src/sans/guiframe/startup_configuration.py

@@ -117 +117 @@
         """
         event.Skip()
-        
-        gui_pw, gui_ph = self.parent.GetSizeTuple()
+        if self.parent.IsMaximized():
+            gui_pw, gui_ph = (0, 0)
+        else:
+            gui_pw, gui_ph = self.parent.GetSizeTuple()
         self.current_string['GUIFRAME_WIDTH'] = gui_pw
         self.current_string['GUIFRAME_HEIGHT'] = gui_ph