Changeset ba152f1 in sasview

Timestamp:

Apr 20, 2013 9:32: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:

7267776a

Parents:

ae84427

Message:

main frame fix for mac I

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (5 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -194 +194 @@
 TIME_FACTOR = 2
 NOT_SO_GRAPH_LIST = ["BoxSum"]
-if sys.platform.count("win32")==0:
+if sys.platform.count("darwin") > 0:
     IS_WIN = False
     TIME_FACTOR = 2
@@ -1002 +1002 @@
         self._data_panel = DataPanel(parent=win)
         win.set_panel(self._data_panel)
-        win.EnableCloseButton(False)
         self.panels["data_panel"] = self._data_panel
         self._data_panel.set_frame(win)
@@ -1010 +1009 @@
         else:
             flag = True
+        self._data_panel.frame.EnableCloseButton(False)
         win.Show(flag)
         d_panel_width = w
@@ -3248 +3248 @@
                              size=size)
         self.frame.Hide()
+        if not IS_WIN:
+            self.frame.EnableCloseButton(False)
         self.s_screen = None
 
@@ -3418 +3420 @@
                 posX = (displayWidth - customWidth)/2
                 posY = (displayHeight - customHeight)/2
-        
+        else:
+            customHeight = 80
+            is_maximized = False
         # Return the suggested position and size for the application frame.    
         return (posX, posY), (customWidth, customHeight), is_maximized