Changeset 7d90e55 in sasview

Timestamp:

Apr 21, 2013 1:33:13 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:

31ac4a1

Parents:

cb6a2b7

Message:

still trying to fix scrollpanel on mac

File:

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

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -988 +988 @@
         win = MDIFrame(self, None, 'None', (100, 200))
         #win.EnableCloseButton(False)
-        self._data_panel = DataPanel(parent=win)
-        win.set_panel(self._data_panel)
-        self._data_panel.set_frame(win)
-        self.panels["data_panel"] = self._data_panel
+        data_panel = DataPanel(parent=win,  id=-1)
+        win.set_panel(data_panel)
+        data_panel.set_frame(win)
+        self.panels["data_panel"] = data_panel
+        self._data_panel = data_panel
+        frame = self._data_panel.get_frame()
         w, h = self._get_panels_size(self._data_panel)
-        win.SetSize((w, h))
+        frame.SetSize((w, h))
         style = self.__gui_style & GUIFRAME.MANAGER_ON
         if style != GUIFRAME.MANAGER_ON:
@@ -1001 +1003 @@
         if not IS_WIN:
             x_pos, _ = win.GetPositionTuple()
-            win.SetPosition((x_pos, mac_pos_y + 70))
-        win.Show(flag)
+            frame.SetPosition((x_pos, mac_pos_y + 70))
+        frame.Show(flag)
         d_panel_width = w
         # Add the panels to the AUI manager
@@ -1019 +1021 @@
                     frame.SetSize((w, h))
                     frame.Show(False)
+            elif panel_class == self._data_panel:
+                continue
             else:
                 self.panels[str(id)] = panel_class