Changeset a36a22a in sasview

Timestamp:

Apr 21, 2013 10:53:20 AM (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:

a2f7fcc

Parents:

7f79ea95

Message:

adjusting panel position on mac

File:

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

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -198 +198 @@
     IS_WIN = False
     TIME_FACTOR = 2
-    PARENT_STYLE = wx.DEFAULT_FRAME_STYLE | wx.STAY_ON_TOP
+    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:
@@ -979 +979 @@
         frame = self.defaultPanel.get_frame()
         frame.SetSize((self._window_width, self._window_height))
+        if not IS_WIN:
+            x_pos, _ = frame.GetPositionTuple()
+            frame.SetPosition((x_pos, mac_pos_y + 75))
         frame.Show(True)
         #add data panel 
@@ -1017 +1020 @@
             if not IS_WIN:
                 x_pos, _ = frame.GetPositionTuple()
-                frame.SetPosition((x_pos, mac_pos_y + 50))
+                frame.SetPosition((x_pos, mac_pos_y + 75))
 
         if not IS_WIN:
@@ -1165 +1168 @@
         p.frame.SetTitle(p.window_caption)
         p.frame.name = p.window_name
+        if not IS_WIN:
+            p.frame.Center()
         p.frame.Show(True)
-        #if p not in self.schedule_full_draw_list:
-        #    self.schedule_full_draw_list.append(p)
-        """
-        if style1 == GUIFRAME.FIXED_PANEL:
-            self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
-                              Name(p.window_name).
-                              Caption(p.window_caption).
-                              Position(10).
-                              Floatable().
-                              Right().
-                              Dock().
-                              MinimizeButton(True).MaximizeButton(True).
-                              Resizable(True).
-                              # Use a large best size to make sure the AUI 
-                              # manager takes all the available space
-                              BestSize(wx.Size(p_panel_width, 
-                                               p_panel_height)))
-            self._popup_fixed_panel(p)
-        elif style2 == GUIFRAME.FLOATING_PANEL:
-            self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
-                              Name(p.window_name).Caption(p.window_caption).
-                              MinimizeButton(True).MaximizeButton(True).
-                              Resizable(True).
-                              # Use a large best size to make sure the AUI
-                              #  manager takes all the available space
-                              BestSize(wx.Size(p_panel_width, 
-                                               p_panel_height)))
-            
-            self._popup_floating_panel(p)
-        """
-        # Register for closing of panels
-        #self.Bind(wx.aui.EVT_AUI_PANE_CLOSE, self.on_panel_close)
+
         # Register for showing/hiding the panel
         wx.EVT_MENU(self, ID, self.on_view)