Changeset b6a6d87 in sasview

Timestamp:

Apr 29, 2013 9:40:16 AM (11 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:

431896cf

Parents:

f234d3c

Message:

trying to fix main frame size: mac & linux

Files:

• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (1 diff)
• calculatorview/src/sans/perspectives/calculator/resolution_calculator_panel.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (2 diffs)

calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py

@@ -1802 +1802 @@
         Init
         """
-        if parent != None:
-            # set max size depending up on client size
-            wth, hgt = parent.get_client_size()
-            if hgt < size[1]:
-                size = (size[0], hgt)
-            if wth < size[0]:
-                size = (wth, size[1])
         kwds['size'] = size
         kwds['title'] = title

calculatorview/src/sans/perspectives/calculator/resolution_calculator_panel.py

@@ -1399 +1399 @@
                  title = "SANS Resolution Estimator",
                  size=(PANEL_WIDTH * 2, PANEL_HEIGHT), *args, **kwds):
-        if parent != None:
-            # set max size depending up on client size
-            wth, hgt = parent.get_client_size()
-            if hgt < size[1]:
-                size = (size[0], hgt)
-            if wth < size[0]:
-                size = (wth, size[1])
         kwds['title'] = title
         kwds['size'] = size

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -1051 +1051 @@
                 win_height = mac_pos_y + 55
             self.SetSize((self._window_width, win_height))
-            max_height = mac_pos_y + 70
-            self.SetMaxSize((-1, max_height))
         
     def update_data(self, prev_data, new_data):
@@ -3203 +3201 @@
         if not IS_WIN:
             self.frame.EnableCloseButton(False)
+            # It is floating toolbar/statusbar 
+            max_height = 90
+            self.frame.SetMaxSize((-1, max_height))
         self.s_screen = None