dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

First pass at cleaning up context menu events (#1895)

Browse Source
This commit is contained in:
Ryan Holmes
2019-03-24 18:55:25 -04:00
parent 656a7fc784
commit 253d3107a0
8 changed files with 16 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gui/builtinViews/fittingView.py
View File

@@ -153,10 +153,7 @@ class FittingView(d.Display):
self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem)
self.Bind(wx.EVT_LIST_BEGIN_DRAG, self.startDrag)
if "__WXGTK__" in wx.PlatformInfo:
self.Bind(wx.EVT_RIGHT_UP, self.scheduleMenu)
else:
self.Bind(wx.EVT_RIGHT_DOWN, self.scheduleMenu)
self.Bind(wx.EVT_CONTEXT_MENU, self.spawnMenu)
self.SetDropTarget(FittingViewDrop(self.handleListDrag))
self.activeFitID = None
@@ -168,7 +165,6 @@ class FittingView(d.Display):
self.Bind(wx.EVT_KEY_UP, self.kbEvent)
self.Bind(wx.EVT_LEFT_DOWN, self.click)
self.Bind(wx.EVT_RIGHT_DOWN, self.click)
self.Bind(wx.EVT_MIDDLE_DOWN, self.click)
self.Bind(wx.EVT_SHOW, self.OnShow)
self.Bind(wx.EVT_MOTION, self.OnMouseMove)
@@ -535,12 +531,7 @@ class FittingView(d.Display):
finally:
event.Skip()
def scheduleMenu(self, event):
event.Skip()
if self.getColumn(event.Position) != self.getColIndex(State):
wx.CallAfter(self.spawnMenu)
def spawnMenu(self):
def spawnMenu(self, event):
if self.activeFitID is None:
return