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

Fixed a visual bug in shipbrowser fit item selected state

Browse Source
This commit is contained in:
HomeWorld
2011-01-16 20:25:04 +02:00
parent 4b50c6bae9
commit 97643a28fc
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/shipBrowser.py
View File

@@ -1214,6 +1214,8 @@ class FitItem(SFItem.SFBrowserItem):
self.animPeriod = 10 self.animPeriod = 10
self.animDuration = 100 self.animDuration = 100
self.maxDelta = 60
self.Bind(wx.EVT_TIMER, self.OnTimer) self.Bind(wx.EVT_TIMER, self.OnTimer)
if self.shipBrowser.GetActiveStage() != 4 and self.shipBrowser.GetLastStage() !=3: if self.shipBrowser.GetActiveStage() != 4 and self.shipBrowser.GetLastStage() !=3:
@@ -1230,13 +1232,13 @@ class FitItem(SFItem.SFBrowserItem):
if self.selTimerID == event.GetId(): if self.selTimerID == event.GetId():
ctimestamp = time.time() ctimestamp = time.time()
interval = 10 interval = 5
if ctimestamp < self.timestamp + interval: if ctimestamp < self.timestamp + interval:
delta = (ctimestamp - self.timestamp) / interval delta = (ctimestamp - self.timestamp) / interval
self.selectedDelta = self.CalculateDelta(0x0,0x66,delta) self.selectedDelta = self.CalculateDelta(0x0,self.maxDelta,delta)
self.Refresh() self.Refresh()
else: else:
self.selectedDelta = 0x66 self.selectedDelta = self.maxDelta
self.selTimer.Stop() self.selTimer.Stop()
if self.animTimerId == event.GetId(): if self.animTimerId == event.GetId():
@@ -1526,7 +1528,7 @@ class FitItem(SFItem.SFBrowserItem):
elif state == SFItem.SB_ITEM_SELECTED | SFItem.SB_ITEM_HIGHLIGHTED: elif state == SFItem.SB_ITEM_SELECTED | SFItem.SB_ITEM_HIGHLIGHTED:
eFactor = 0.3 eFactor = 0.3
elif state == SFItem.SB_ITEM_SELECTED: elif state == SFItem.SB_ITEM_SELECTED:
eFactor = (0x33 - self.selectedDelta)/100 eFactor = (self.maxDelta - self.selectedDelta)/100 + 0.15
else: else:
sFactor = 0 sFactor = 0