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

Moved duplicate code from shipbrowser items OnPaint in gui.utils.drawUtils

Browse Source
This commit is contained in:
HomeWorld
2010-12-09 16:55:41 +02:00
parent 94ececb715
commit 79a524f7bb
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gui/shipBrowser.py
View File

@@ -10,6 +10,7 @@ import service
from wx.lib.buttons import GenBitmapButton
import gui.utils.colorUtils as colorUtils
import gui.utils.drawUtils as drawUtils
FitRenamed, EVT_FIT_RENAMED = wx.lib.newevent.NewEvent()
FitSelected, EVT_FIT_SELECTED = wx.lib.newevent.NewEvent()
@@ -761,21 +762,16 @@ class CategoryItem(wx.Window):
mdc = wx.BufferedPaintDC(self)
r = copy.copy(rect)
r.top = 0
r.left = 0
r.height = r.height / 2
if self.highlighted:
mdc.GradientFillLinear(r, gStart, gEnd, wx.SOUTH)
r.top = r.height
mdc.GradientFillLinear(r, gMid, gEnd, wx.NORTH)
mdc.SetTextForeground(textColor)
bkBitmap = drawUtils.DrawGradientBar(rect.width, rect.height, gStart, gEnd, gMid)
mdc.DrawBitmap(bkBitmap, 0,0)
else:
mdc.SetBackground(wx.Brush(windowColor))
mdc.SetTextForeground(textColor)
mdc.Clear()
mdc.SetTextForeground(textColor)
mdc.DrawBitmap(self.shipBmp,5,(rect.height-self.shipBmp.GetWidth())/2,0)
mdc.SetFont(self.fontBig)
@@ -1005,14 +1001,9 @@ class ShipItem(wx.Window):
mdc = wx.BufferedPaintDC(self)
r = copy.copy(rect)
r.top = r.left = 0
r.height = r.height / 2
if self.highlighted:
mdc.GradientFillLinear(r, gStart, gEnd, wx.SOUTH)
r.top = r.height
mdc.GradientFillLinear(r, gMid, gEnd, wx.NORTH)
bkBitmap = drawUtils.DrawGradientBar(rect.width, rect.height, gStart, gEnd, gMid)
mdc.DrawBitmap(bkBitmap, 0,0)
mdc.SetTextForeground(textColor)
else:
@@ -1523,9 +1514,8 @@ class FitItem(wx.Window):
r.height = r.height / 2
if self.highlighted:
mdc.GradientFillLinear(r, gStart, gEnd, wx.SOUTH)
r.top = r.height
mdc.GradientFillLinear(r, gMid, gEnd, wx.NORTH)
bkBitmap = drawUtils.DrawGradientBar(rect.width, rect.height, gStart, gEnd, gMid)
mdc.DrawBitmap(bkBitmap, 0,0)
else:
activeFitID = self.mainFrame.getActiveFit()
@@ -1533,9 +1523,8 @@ class FitItem(wx.Window):
if activeFitID == self.fitID:
gStart = colorUtils.GetSuitableColor(windowColor, 0.2)
gMid = colorUtils.GetSuitableColor(windowColor, (0x33 - self.selectedDelta)/100)
mdc.GradientFillLinear(r, gStart, gMid, wx.SOUTH)
r.top = r.height
mdc.GradientFillLinear(r, gStart, gMid, wx.NORTH)
bkBitmap = drawUtils.DrawGradientBar(rect.width, rect.height, gStart, gMid)
mdc.DrawBitmap(bkBitmap, 0,0)
else:
mdc.SetBackground(wx.Brush(windowColor))
mdc.Clear()

21
gui/utils/drawUtils.py Normal file
View File

@@ -0,0 +1,21 @@
import wx
def DrawGradientBar(width, height, gStart, gEnd, gMid = None):
canvas = wx.EmptyBitmap(width,height)
mdc = wx.MemoryDC()
mdc.SelectObject(canvas)
r = wx.Rect(0, 0, width, height)
r.height = r.height / 2
if gMid is None:
gMid = gStart
mdc.GradientFillLinear(r, gStart, gEnd, wx.SOUTH)
r.top = r.height
mdc.GradientFillLinear(r, gMid, gEnd, wx.NORTH)
mdc.SelectObject(wx.NullBitmap)
return canvas