From 374f91eec9d854dc3e2a5e60595770669d431309 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Sat, 11 Dec 2010 13:40:44 +0200 Subject: [PATCH] Fixed implant/booster views dblclick behaviour - added a check for remove case - we do not want our items removed if we are double clicking on state column --- gui/boosterView.py | 10 ++++++---- gui/implantView.py | 12 +++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gui/boosterView.py b/gui/boosterView.py index 1e96af409..ffcc58e8f 100644 --- a/gui/boosterView.py +++ b/gui/boosterView.py @@ -63,10 +63,12 @@ class BoosterView(d.Display): def removeItem(self, event): row, _ = self.HitTest(event.Position) if row != -1: - fitID = self.mainFrame.getActiveFit() - cFit = service.Fit.getInstance() - cFit.removeBooster(fitID, self.GetItemData(row)) - wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) + col = self.getColumn(event.Position) + if col != self.getColIndex(State): + fitID = self.mainFrame.getActiveFit() + cFit = service.Fit.getInstance() + cFit.removeBooster(fitID, self.GetItemData(row)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def click(self, event): event.Skip() diff --git a/gui/implantView.py b/gui/implantView.py index d0247c884..ed9e4e91a 100644 --- a/gui/implantView.py +++ b/gui/implantView.py @@ -76,11 +76,13 @@ class ImplantView(d.Display): def removeItem(self, event): row, _ = self.HitTest(event.Position) if row != -1: - fitID = self.mainFrame.getActiveFit() - cFit = service.Fit.getInstance() - implant = self.implants[self.GetItemData(row)] - cFit.removeImplant(fitID, self.original.index(implant)) - wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) + col = self.getColumn(event.Position) + if col != self.getColIndex(State): + fitID = self.mainFrame.getActiveFit() + cFit = service.Fit.getInstance() + implant = self.implants[self.GetItemData(row)] + cFit.removeImplant(fitID, self.original.index(implant)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def click(self, event): event.Skip()