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

OMG I HAVE A SHIP BROWSER NOW :3 (replace old instances of GetSuitableColor with GetSuitable)

Browse Source
This commit is contained in:
Ryan Holmes
2017-06-12 21:25:07 -04:00
parent 0e7dccccfe
commit 7e86cb0f84
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinShipBrowser/categoryItem.py
View File

@@ -101,7 +101,7 @@ class CategoryItem(SFBrowserItem):
self.UpdateElementsPos(mdc)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
textColor = colorUtils.GetSuitableColor(windowColor, 1)
textColor = colorUtils.GetSuitable(windowColor, 1)
mdc.SetTextForeground(textColor)
mdc.DrawBitmap(self.dropShadowBitmap, self.shipBmpx + 1, self.shipBmpy + 1)

2
gui/builtinShipBrowser/fitItem.py
View File

@@ -480,7 +480,7 @@ class FitItem(SFItem.SFBrowserItem):
rect = self.GetRect()
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
textColor = colorUtils.GetSuitableColor(windowColor, 1)
textColor = colorUtils.GetSuitable(windowColor, 1)
mdc.SetTextForeground(textColor)

4
gui/builtinShipBrowser/navigationPanel.py
View File

@@ -212,8 +212,8 @@ class NavigationPanel(SFItem.SFBrowserItem):
rect = self.GetRect()
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
textColor = colorUtils.GetSuitableColor(windowColor, 1)
sepColor = colorUtils.GetSuitableColor(windowColor, 0.2)
textColor = colorUtils.GetSuitable(windowColor, 1)
sepColor = colorUtils.GetSuitable(windowColor, 0.2)
mdc.SetTextForeground(textColor)

4
gui/builtinShipBrowser/raceSelector.py
View File

@@ -167,8 +167,8 @@ class RaceSelector(wx.Window):
rect = self.GetRect()
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
# bkColor = colorUtils.GetSuitableColor(windowColor, 0.1)
sepColor = colorUtils.GetSuitableColor(windowColor, 0.2)
# bkColor = colorUtils.GetSuitable(windowColor, 0.1)
sepColor = colorUtils.GetSuitable(windowColor, 0.2)
mdc = wx.BufferedPaintDC(self)

2
gui/builtinShipBrowser/shipItem.py
View File

@@ -233,7 +233,7 @@ class ShipItem(SFItem.SFBrowserItem):
# rect = self.GetRect()
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
textColor = colorUtils.GetSuitableColor(windowColor, 1)
textColor = colorUtils.GetSuitable(windowColor, 1)
mdc.SetTextForeground(textColor)

4
gui/utils/anim.py
View File

@@ -58,7 +58,7 @@ class LoadAnimation(wx.Window):
dc.Clear()
barColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
shadeColor = colorUtils.GetSuitableColor(barColor, 0.75)
shadeColor = colorUtils.GetSuitable(barColor, 0.75)
barWidth = rect.width / self.bars
barHeight = rect.height - self.padding * 2
@@ -72,7 +72,7 @@ class LoadAnimation(wx.Window):
bh = barHeight
y = self.padding
else:
barColor = colorUtils.GetSuitableColor(barColor, float(self.animCount / 2) / 10)
barColor = colorUtils.GetSuitable(barColor, float(self.animCount / 2) / 10)
dc.SetPen(wx.Pen(barColor))
dc.SetBrush(wx.Brush(barColor))
bh = rect.height