Merge branch 'ammo_graph' into singularity

# Conflicts: # gui/targetProfileEditor.py
2020-06-09 19:04:20 +03:00
parent 7eaeea325d aec5a46452
commit 27d3bea8d8
28 changed files with 582 additions and 232 deletions
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -166,7 +166,7 @@ class FittingView(d.Display):
        self.hoveredRow = None
        self.hoveredColumn = None

-        self.Bind(wx.EVT_KEY_DOWN, self.kbEvent)
+        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)