Changeset caf273b in sasview for src/sans/guiframe/gui_manager.py

Timestamp:

Apr 3, 2014 7:03:28 AM (10 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:

eea3ffa

Parents:

ea67541

Message:

Re #216 Fix toolbar issue.

File:

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

src/sans/guiframe/gui_manager.py

@@ -229 +229 @@
         """
 
-        PARENT_FRAME.__init__(self, parent=parent, title=title, pos=pos, size=size)
+        PARENT_FRAME.__init__(self, parent=parent, title=title, pos=pos, size=size, style=wx.SYSTEM_MENU | wx.CAPTION | wx.CLOSE_BOX)
         # title
         self.title = title
@@ -978 +978 @@
         # Look for plug-in panels
         panels = []  
-        mac_pos_y = 40  
+        mac_pos_y = 85
         for item in self.plugins:
             if hasattr(item, "get_panels"):
@@ -1048 +1048 @@
             win_height = mac_pos_y
             if IS_LINUX:
-                win_height = mac_pos_y + 55
+                win_height = mac_pos_y + 10
                 self.SetMaxSize((-1, win_height))
             else:
@@ -1239 +1239 @@
         add toolbar to the frame
         """
-        #set toolbar
-        self._toolbar = GUIToolBar(self, -1)
-        self.SetToolBar(self._toolbar)
+        # Set toolbar
+        self._toolbar = GUIToolBar(self)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self._toolbar, 0, wx.EXPAND)
+        self.SetSizer(sizer)
         self._update_toolbar_helper()
         self._on_toggle_toolbar(event=None)