Changeset 39b7019 in sasview

Timestamp:

Sep 26, 2009 9:11:12 AM (15 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:

beaaa8b

Parents:

8eeb0b6

Message:

sansview: fix highlighting for sansview text controls

File:

• sansview/perspectives/fitting/basepage.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -140 +140 @@
             @param text_enter_callback: callback method for EVT_TEXT_ENTER event
         """
+        ## Set to True when the mouse is clicked while the whole string is selected
+        full_selection = False
+        ## Call back for EVT_SET_FOCUS events
+        _on_set_focus_callback = None
+        
         def __init__(self, parent, id=-1, value=wx.EmptyString, pos=wx.DefaultPosition, 
                      size=wx.DefaultSize, style=0, validator=wx.DefaultValidator, name=wx.TextCtrlNameStr,
@@ -148 +153 @@
             
             # Bind appropriate events
-            self.Bind(wx.EVT_SET_FOCUS,  parent.onSetFocus \
-                      if set_focus_callback is None else set_focus_callback)
+            self._on_set_focus_callback = parent.onSetFocus \
+                      if set_focus_callback is None else set_focus_callback
+            self.Bind(wx.EVT_SET_FOCUS, self._on_set_focus)
             self.Bind(wx.EVT_KILL_FOCUS, parent._onparamEnter \
                       if kill_focus_callback is None else kill_focus_callback)
             self.Bind(wx.EVT_TEXT_ENTER, parent._onparamEnter \
                       if text_enter_callback is None else text_enter_callback)
-            self.Bind(wx.EVT_LEFT_UP,    parent._highlight_text \
+            self.Bind(wx.EVT_LEFT_UP,    self._highlight_text \
                       if mouse_up_callback is None else mouse_up_callback)
+            
+        def _on_set_focus(self, event):
+            """
+                Catch when the text control is set in focus to highlight the whole
+                text if necessary
+                @param event: mouse event
+            """
+            event.Skip()
+            self.full_selection = True
+            return self._on_set_focus_callback(event)
+        
+        def _highlight_text(self, event):
+            """
+                Highlight text of a TextCtrl only of no text has be selected
+                @param event: mouse event
+            """
+            # Make sure the mouse event is available to other listeners
+            event.Skip()
+            control  = event.GetEventObject()
+            if self.full_selection:
+                self.full_selection = False
+                # Check that we have a TextCtrl
+                if issubclass(control.__class__, wx.TextCtrl):
+                    # Check whether text has been selected, 
+                    # if not, select the whole string
+                    (start, end) = control.GetSelection()
+                    if start==end:
+                        control.SetSelection(-1,-1)
+                    
        
     def onContextMenu(self, event): 
@@ -479 +514 @@
             after fitting
         """
-        
         if hasattr(self,"text2_3"):
             self.text2_3.Hide()
@@ -503 +537 @@
         return
     
-    def _highlight_text(self, event):
-        """
-            Highlight text of a TextCtrl only of no text has be selected
-            @param event: mouse event
-        """
-        control  = event.GetEventObject()
-        # Check that we have a TextCtrl
-        if issubclass(control.__class__, wx.TextCtrl):
-            # Check whether text has been selected, 
-            # if not, select the whole string
-
-            (start, end) = control.GetSelection()
-            if start==end:
-                control.SetSelection(-1,-1)
-                
-        # Make sure the mouse event is available to other listeners
-        event.Skip()
-
     
     def read_file(self, path):