Changeset c31fd9f in sasview

Timestamp:

Jun 24, 2011 12:22:54 PM (14 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:

8b6ab2d

Parents:

92f5521a

Message:

all scrollwindows: unfocus child when scrolling: wx2.9 bug fix

Files:

• guiframe/data_panel.py (modified) (1 diff)
• invariantview/perspectives/invariant/invariant_panel.py (modified) (1 diff)
• prview/perspectives/pr/inversion_panel.py (modified) (1 diff)
• sansview/perspectives/fitting/basepage.py (modified) (2 diffs)

guiframe/data_panel.py

@@ -158 +158 @@
             self.parent.Bind(EVT_DELETE_PLOTPANEL, self._on_delete_plot_panel)
        
-        
+        ## Bypass resetting the scroll position at focusing child
+        self.Bind(wx.EVT_SCROLLWIN_THUMBTRACK, self._scroll_skip)
+        
+    def _scroll_skip(self, event):
+        """
+        Unfocus children when scrolling: This fixes a problem w/wx2.9
+        """
+        # If any children are focused, unfocuse them
+        if self != self.FindFocus():
+            self.SetFocusIgnoringChildren()
+        return
+     
     def do_layout(self):
         """

invariantview/perspectives/invariant/invariant_panel.py

@@ -103 +103 @@
         self._default_save_location = os.getcwd()
         self._set_bookmark_flag(False)
-        
+        ## Bypass resetting the scroll position at focusing child
+        self.Bind(wx.EVT_SCROLLWIN_THUMBTRACK, self._scroll_skip)
+        
+    def _scroll_skip(self, event):
+        """
+        Unfocus children when scrolling: This fixes a problem w/wx2.9
+        """
+        # If any children are focused, unfocuse them
+        if self != self.FindFocus():
+            self.SetFocusIgnoringChildren()
+        return
+    
     def get_data(self):
         """

prview/perspectives/pr/inversion_panel.py

@@ -90 +90 @@
         self._default_width = 350
         self._do_layout()
+        ## Bypass resetting the scroll position at focusing child
+        self.Bind(wx.EVT_SCROLLWIN_THUMBTRACK, self._scroll_skip)
+        
+    def _scroll_skip(self, event):
+        """
+        Unfocus children when scrolling: This fixes a problem w/wx2.9
+        """
+        # If any children are focused, unfocuse them
+        if self != self.FindFocus():
+            self.SetFocusIgnoringChildren()
+        return
         
     def __setattr__(self, name, value):

sansview/perspectives/fitting/basepage.py

@@ -163 +163 @@
         # bind key event
         self.Bind(wx.EVT_LEFT_DOWN, self.on_left_down)
-        self.Bind(wx.EVT_SCROLLWIN_THUMBRELEASE, self._scroll_pass)
+        
         ## create the basic structure of the panel with empty sizer
         self.define_page_structure()
@@ -171 +171 @@
         ## layout
         self.set_layout()
-        
-    
-    def _scroll_pass(self, event):    
-        """
-        """
-        pass
+        ## Bypass resetting the scroll position at focusing child
+        self.Bind(wx.EVT_SCROLLWIN_THUMBTRACK, self._scroll_skip)
+        
+    def _scroll_skip(self, event):
+        """
+        Unfocus children when scrolling: This fixes a problem w/wx2.9
+        """
+        # If any children are focused, unfocuse them
+        if self != self.FindFocus():
+            self.SetFocusIgnoringChildren()
+        return
     
     def on_set_focus(self, event):