Changeset 7267776a in sasview

Timestamp:

Apr 20, 2013 10:43:30 PM (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:

e173956

Parents:

ba152f1

Message:

toolbar fix II for mac

File:

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

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -194 +194 @@
 TIME_FACTOR = 2
 NOT_SO_GRAPH_LIST = ["BoxSum"]
+PARENT_STYLE = wx.DEFAULT_FRAME_STYLE
 if sys.platform.count("darwin") > 0:
     IS_WIN = False
     TIME_FACTOR = 2
+    PARENT_STYLE = wx.DEFAULT_FRAME_STYLE | wx.STAY_ON_TOP
     if int(str(wx.__version__).split('.')[0]) == 2:
         if int(str(wx.__version__).split('.')[1]) < 9:
@@ -209 +211 @@
                  size=(GUIFRAME_WIDTH, GUIFRAME_HEIGHT),
                  gui_style=DEFAULT_STYLE, 
-                 style=wx.DEFAULT_FRAME_STYLE,
+                 style=PARENT_STYLE,
                  pos=wx.DefaultPosition):
         """
@@ -1053 +1055 @@
                                   Hide())        
                 """
+            if not IS_WIN:
+                x_pos, _ = frame.GetPositionTuple()
+                _, y_size = self.GetSizeTuple()
+                frame.SetPosition((x_pos, y_size))
         #if frame != None:
         #    frame.EnableCloseButton(False)
+        if not IS_WIN:
+            self.SetSize((self._window_width, 5))
         
     def update_data(self, prev_data, new_data):
@@ -3420 +3428 @@
                 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