Changeset 1488 for trunk/peppy/actions/minibuffer.py

Timestamp:

07/11/08 08:03:25 (4 months ago)

Author:

rob

Message:

Fixed the bad SetFocus? call by placing both the removeFromParent and performAction methods in CallAfters?
* added the performAction method to call the action's processMinibuffer

Files:

• trunk/peppy/actions/minibuffer.py (modified) (4 diffs)

trunk/peppy/actions/minibuffer.py

@@ -185 +185 @@
         if self.mode:
             wx.CallAfter(self.mode.removeMinibuffer, self)
-        
+    
+    def performAction(self, value):
+        """Execute the processMinibuffer method of the action"""
+        error = self.action.processMinibuffer(self, self.mode, value)
+        if error is not None:
+            self.mode.frame.SetStatusText(error)
 
 
@@ -235 +240 @@
             self.finish_callback()
         else:
-            self.mode.removeMinibuffer(detach_only=True)
+            # Remove the minibuffer and perform the action in CallAfters so
+            # the tab focus doesn't get confused.  If you try to perform these
+            # actions directly, the focus will return to the original tab if
+            # the action causes a new tab to be created.  Moving everything to
+            # CallAfters prevents this.
+            wx.CallAfter(self.removeFromParent)
             if text is not None:
-                error = self.action.processMinibuffer(self, self.mode, text)
-                if error is not None:
-                    self.mode.frame.SetStatusText(error)
-            self.close()
-            #self.removeFromParent()
+                wx.CallAfter(self.performAction, text)
+        
 
 class IntMinibuffer(TextMinibuffer):
@@ -390 +397 @@
         #self.text.SetInsertionPointEnd()
 
+        # FIXME: Using the EVT_SET_FOCUS doesn't seem to work to set the cursor
+        # to the end of the text.  It doesn't seem to get called at all, so
+        # the only way to do it appears to be to co-opt the Panel's SetFocus
+        # method
         self.win.saveSetFocus = self.win.SetFocus
         self.win.SetFocus = self.SetFocus
         
     def SetFocus(self):
-        dprint(self)
+        #dprint(self)
         self.win.saveSetFocus()
         self.text.SetInsertionPointEnd()
     
     def OnFocus(self, evt):
-        dprint()
+        #dprint()
         self.text.SetInsertionPointEnd()
 
@@ -486 +497 @@
                 return
         
-        error = self.action.processMinibuffer(self, self.mode, results)
-        if error is not None:
-            self.mode.frame.SetStatusText(error)
-        self.removeFromParent()
+        wx.CallAfter(self.removeFromParent)
+        wx.CallAfter(self.performAction, results)