Changeset af72b2e in sasview

Timestamp:

Apr 21, 2013 10:17:51 AM (11 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:

7f79ea95

Parents:

e173956

Message:

trying to fix datapanel close buton on mac

Location:

sansguiframe/src/sans/guiframe

Files:

• data_panel.py (modified) (1 diff)
• gui_manager.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/data_panel.py

@@ -1064 +1064 @@
         """
         return self.frame 
-
+    
+    def on_close(self, event):
+        """
+        On close event
+        """
+        self.parent.show_data_panel(event)
+                        
     def set_schedule_full_draw(self, panel=None, func='del'):
         """

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -983 +983 @@
         self.panels["default"] = self.defaultPanel
         w, h = self._get_panels_size(self.defaultPanel)
-        #win = MDIFrame(self, DefaultPanel, "default", 
-        #               (self._window_width, self._window_height))
-        #win.set_panel(self.defaultPanel)
-        #self.defaultPanel.set_frame(win)
         frame = self.defaultPanel.get_frame()
         frame.SetSize((self._window_width, self._window_height))
         frame.Show(True)
-        """
-        self._mgr.AddPane(self.defaultPanel, wx.aui.AuiPaneInfo().
-                              Name("default").
-                              CenterPane().
-                              # This is where we set the size of
-                              # the application window
-                              BestSize(wx.Size(self._window_width, 
-                                               self._window_height)).
-                              Show())
-        """
         #add data panel 
         
@@ -1037 +1023 @@
             if not IS_WIN:
                 x_pos, _ = frame.GetPositionTuple()
-                frame.SetPosition((x_pos, mac_pos_y))
+                frame.SetPosition((x_pos, mac_pos_y + 50))
 
         if not IS_WIN:
-            self.SetSize((self._window_width, 40))
+            self.SetSize((self._window_width, mac_pos_y))
         
     def update_data(self, prev_data, new_data):