Changeset 751abab in sasview for src/sans/guiframe

Timestamp:

Apr 4, 2014 4:01:09 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

57986a1

Parents:

803d7fb

Message:

tweak toolbar size

File:

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

src/sans/guiframe/gui_manager.py

@@ -977 +977 @@
         """
         # Look for plug-in panels
-        panels = []  
-        mac_pos_y = 85
+        panels = []
+        if wx.VERSION_STRING >= '3.0.0.0':
+            mac_pos_y = 85
+        else:
+            mac_pos_y = 40
         for item in self.plugins:
             if hasattr(item, "get_panels"):
@@ -1048 +1051 @@
             win_height = mac_pos_y
             if IS_LINUX:
-                win_height = mac_pos_y + 10
+                if wx.VERSION_STRING >= '3.0.0.0':
+                    win_height = mac_pos_y + 10
+                else:
+                    win_height = mac_pos_y + 55
                 self.SetMaxSize((-1, win_height))
             else: