Changeset 2850

Timestamp:

Jun 1, 2017 10:53:13 PM (7 years ago)

Author:

toby

Message:

fix arrow key data tree traversal on Mac

Location:

trunk

Files:

• GSASII.py (modified) (3 diffs)
• GSASIIgrid.py (modified) (4 diffs)

trunk/GSASII.py

@@ -2699 +2699 @@
                 self.G2plotNB.nb.GetPage(pltNum)
             item = event.GetItem()
-            wx.CallAfter(G2gd.SelectDataTreeItem,self,item)
-            if self.oldFocus: # Why do this?
-                wx.CallAfter(self.oldFocus.SetFocus)
+            wx.CallAfter(G2gd.SelectDataTreeItem,self,item,self.oldFocus)
+            #if self.oldFocus: # Why do this?
+            #    wx.CallAfter(self.oldFocus.SetFocus)
         
     def OnPatternTreeItemCollapsed(self, event):
@@ -2774 +2774 @@
                     wx.CallAfter(self.PatternTree.SelectItem,item)
             else:    
-                self.PatternTree.GetPrevSibling(item)
-                self.PatternTree.SelectItem(item)
+                item = self.PatternTree.GetPrevSibling(item)
+                if item.IsOk(): self.PatternTree.SelectItem(item)
         elif key == wx.WXK_DOWN:
             if keyevt.GetModifiers() == wx.MOD_SHIFT and parent != self.root:
@@ -2788 +2788 @@
                     wx.CallAfter(self.PatternTree.SelectItem,item)
             else:    
-                self.PatternTree.GetNextSibling(item)
-                self.PatternTree.SelectItem(item)
+                item = self.PatternTree.GetNextSibling(item)
+                if item.IsOk(): self.PatternTree.SelectItem(item)
                 
     def OnReadPowderPeaks(self,event):

trunk/GSASIIgrid.py

@@ -4510 +4510 @@
     return 0                
 
-def SelectDataTreeItem(G2frame,item):
+def SelectDataTreeItem(G2frame,item,oldFocus=None):
     '''Called from :meth:`GSASII.GSASII.OnDataTreeSelChanged` when a item is selected on the tree.
     Also called from GSASII.OnPatternTreeEndDrag, OnAddPhase -- might be better to select item, triggering
@@ -4558 +4558 @@
         
     SetDataMenuBar(G2frame)
-    G2frame.dataFrame.Raise()            
     G2frame.dataFrame.currentGrids = [] # this will contain pointers to a grid placed in the frame
     G2frame.PickId = item
@@ -4570 +4569 @@
         wx.TextCtrl(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize(),
                     value='Select an item from the tree to see/edit parameters')        
+        G2frame.dataFrame.Raise()            
         return
     else:
@@ -4832 +4832 @@
         G2frame.PickIdText = G2frame.GetTreeItemsList(G2frame.PickId)
     G2frame.dataFrame.Raise()
-
+    if oldFocus:
+        oldFocus.GetTopLevelParent().Raise()
+        oldFocus.SetFocus()
+        
 def SetDataMenuBar(G2frame,menu=None):
     '''Set the menu for the data frame. On the Mac put this