Merge branch 'master' of evefit.org:pyfa

This commit is contained in:
cncfanatics
2010-11-17 19:45:45 +01:00

View File

@@ -495,7 +495,11 @@ class PFTabRenderer:
canvas.SetMaskColour((0x12,0x23,0x32))
self.tabBitmap = canvas
img = canvas.ConvertToImage()
if not img.HasAlpha():
img.InitAlpha()
bmp = wx.BitmapFromImage(img)
self.tabBitmap = bmp
class PFAddRenderer:
def __init__(self, size = (24,12)):
@@ -909,7 +913,8 @@ class PFTabsContainer(wx.Panel):
width = tab.tabWidth - 6
posx, posy = tab.GetPosition()
if not tab.IsSelected():
mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True )
if not 'wxMac' in wx.PlatformInfo:
mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True )
img = tab.Render().ConvertToImage()
img = img.AdjustChannels(1, 1, 1, 0.8)
bmp = wx.BitmapFromImage(img)
@@ -918,7 +923,8 @@ class PFTabsContainer(wx.Panel):
selected = tab
if selected:
posx, posy = selected.GetPosition()
mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True)
if not 'wxMac' in wx.PlatformInfo:
mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True)
bmp = selected.Render()
if self.dragging:
img = bmp.ConvertToImage()