Changeset 523f828 in sasview for sansguiframe/src/sans/guiframe/gui_manager.py

Timestamp:

Apr 25, 2013 6:32:50 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:

7c38c90

Parents:

d0923a3

Message:

adjusting panel positions:Linux

File:

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

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -192 +192 @@
 APPLICATION_WLIST = config.APPLICATION_WLIST
 IS_WIN = True
+IS_LINUX = False
 CLOSE_SHOW = True
 TIME_FACTOR = 2
@@ -205 +206 @@
             CLOSE_SHOW = False
     if sys.platform.count("darwin") < 1:
+        IS_LINUX = True
         PARENT_FRAME = wx.Frame
         CHILD_FRAME = wx.Frame
@@ -989 +991 @@
         frame = self.defaultPanel.get_frame()
         frame.SetSize((self._window_width, self._window_height))
+        size_t_bar = 70
         if not IS_WIN:
             x_pos, _ = frame.GetPositionTuple()
-            frame.SetPosition((x_pos, mac_pos_y + 70))
+            if IS_LINUX:
+                size_t_bar = 115
+            frame.SetPosition((x_pos, mac_pos_y + size_t_bar))
         frame.Show(True)
         #add data panel 
@@ -1012 +1017 @@
         if not IS_WIN:
             x_pos, _ = win.GetPositionTuple()
-            win.SetPosition((x_pos, mac_pos_y + 70))
+            win.SetPosition((x_pos, mac_pos_y + size_t_bar))
         win.Show(flag)
         d_panel_width = w
@@ -1039 +1044 @@
             if not IS_WIN:
                 x_pos, _ = frame.GetPositionTuple()
-                frame.SetPosition((x_pos, mac_pos_y + 70))
+                frame.SetPosition((x_pos, mac_pos_y + size_t_bar))
 
         if not IS_WIN:
-            self.SetSize((self._window_width, mac_pos_y))
+            win_height = mac_pos_y
+            if IS_LINUX:
+                win_height = mac_pos_y + 55
+            self.SetSize((self._window_width, win_height))
         
     def update_data(self, prev_data, new_data):
@@ -3010 +3018 @@
         size_y = 0
         if self.GetToolBar() != None and self.GetToolBar().IsShown():
-            _, size_y = self.GetToolBar().GetSizeTuple()
+            if not IS_LINUX:
+                _, size_y = self.GetToolBar().GetSizeTuple()
         return size_y