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

Do not process mouse left up if the cursor is not in sfbrowser item window

Browse Source
This commit is contained in:
HomeWorld
2011-01-17 06:09:02 +02:00
parent 5047965e67
commit bac0e7f901
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gui/sfBrowserItem.py
View File

@@ -200,6 +200,9 @@ class SFBrowserItem(wx.Window):
self.highlighted = False self.highlighted = False
self.selected = False self.selected = False
self.bkBitmap = None self.bkBitmap = None
self.canBeDragged = False
self.toolbar = PFToolbar(self) self.toolbar = PFToolbar(self)
@@ -246,9 +249,24 @@ class SFBrowserItem(wx.Window):
def MouseMove(self, event): def MouseMove(self, event):
pass pass
def SetDraggable(self, mode = True):
self.canBeDragged = mode
def OnLeftUp(self, event): def OnLeftUp(self, event):
if self.HasCapture(): if self.HasCapture():
self.ReleaseMouse() self.ReleaseMouse()
if not self.canBeDragged:
mposx, mposy = wx.GetMousePosition()
rect = self.GetRect()
rect.top = rect.left = 0
cx,cy = self.ScreenToClient((mposx,mposy))
if not rect.Contains((cx,cy)):
self.SetHighlighted(False)
self.toolbar.ClearState()
self.Refresh()
return
btn = self.toolbar.MouseClick(event) btn = self.toolbar.MouseClick(event)

2
gui/shipBrowser.py
View File

@@ -1198,6 +1198,8 @@ class FitItem(SFItem.SFBrowserItem):
self.fontNormal = wx.FontFromPixelSize((0,14),wx.SWISS, wx.NORMAL, wx.NORMAL, False) self.fontNormal = wx.FontFromPixelSize((0,14),wx.SWISS, wx.NORMAL, wx.NORMAL, False)
self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False) self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False)
self.SetDraggable()
self.toolbar.AddButton(self.copyBmp,"Copy", self.copyBtnCB) self.toolbar.AddButton(self.copyBmp,"Copy", self.copyBtnCB)
self.renameBtn = self.toolbar.AddButton(self.renameBmp,"Rename", self.renameBtnCB) self.renameBtn = self.toolbar.AddButton(self.renameBmp,"Rename", self.renameBtnCB)
self.toolbar.AddButton(self.deleteBmp, "Delete", self.deleteBtnCB) self.toolbar.AddButton(self.deleteBmp, "Delete", self.deleteBtnCB)