Changeset 56acb5d in sasview for sansguiframe/src/sans

Timestamp:

May 4, 2012 9:10:52 AM (13 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:

bf0acea

Parents:

316e231

Message:

fixed recovering menu problem after maximize/restore size p_panel.

File:

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

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -1046 +1046 @@
         for ID in self.plot_panels.keys():
             if self.plot_panels[ID].window_name == panel.name:
+                self.disable_app_menu(self.plot_panels[ID])
                 self.delete_panel(ID)
                 break
+        self.cpanel_on_focus.SetFocus()
     
     
@@ -1753 +1755 @@
         config.printEVT("hide_panel: %s" % ID)
         if ID in self.panels.keys():
-            if self._mgr.GetPane(self.panels[ID].window_name).IsShown():
-                self._mgr.GetPane(self.panels[ID].window_name).Hide()
+            pane = self._mgr.GetPane(self.panels[ID].window_name)
+            if pane.IsMaximized():
+                self._mgr.RestoreMaximizedPane()
+                self.disable_app_menu(self.panels[ID])
+            if pane.IsShown():
+                pane.Hide()
                 item = self._plotting_plugin.menu.FindItemById(uid)
                 item.Check(False)
@@ -1762 +1768 @@
                 # Do not Hide default panel here...
                 #self._mgr.GetPane(self.panels["default"].window_name).Hide()
-            self._mgr.Update()
+            wx.CallAfter(self._mgr.Update)
+            self.cpanel_on_focus.SetFocus()
                 
     def delete_panel(self, uid):