From df23cd1726ffaa96a7d7a04508d5e30016125163 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Thu, 4 Nov 2010 22:13:18 +0200 Subject: [PATCH] Use different fit actions for dropping a fit in multiswitch or onto fittingview --- gui/shipBrowser.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 4f6e90437..dd5a2b25e 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -1487,14 +1487,24 @@ class FitItem(wx.Window): self.dragWindow.Destroy() msrect = self.mainFrame.fitMultiSwitch.GetRect() mspos = self.mainFrame.fitMultiSwitch.GetPosition() + cpagewnd = self.mainFrame.fitMultiSwitch.GetCurrentPage() + fvrect = cpagewnd.GetRect() + fvpos = cpagewnd.GetPosition() + fvpos = cpagewnd.ClientToScreen(fvpos) mspos = self.mainFrame.fitMultiSwitch.ClientToScreen(mspos) + fvrect.x = fvpos.x + fvrect.y = fvpos.y msrect.x = mspos.x msrect.y = mspos.y - if msrect.Contains(pos): + msrect.height -= fvrect.height + if fvrect.Contains(pos): + wx.PostEvent(self.mainFrame, FitSelected(fitID=self.fitID)) + elif msrect.Contains(pos): if self.mainFrame.getActiveFit(): self.mainFrame.fitMultiSwitch.AddTab() wx.PostEvent(self.mainFrame, FitSelected(fitID=self.fitID)) + event.Skip() return if self.dragging: