Uncommited stuff
This commit is contained in:
38
miniframe.py
38
miniframe.py
@@ -304,7 +304,10 @@ class PFTabRenderer:
|
|||||||
|
|
||||||
mdc.SelectObject(wx.NullBitmap)
|
mdc.SelectObject(wx.NullBitmap)
|
||||||
canvas.SetMaskColour((13,22,31))
|
canvas.SetMaskColour((13,22,31))
|
||||||
|
if not self.selected:
|
||||||
|
img = canvas.ConvertToImage()
|
||||||
|
img = img.AdjustChannels(1, 1, 1, 0.8)
|
||||||
|
canvas = wx.BitmapFromImage(img)
|
||||||
self.tabBitmap = canvas
|
self.tabBitmap = canvas
|
||||||
|
|
||||||
class PFAddRenderer:
|
class PFAddRenderer:
|
||||||
@@ -479,9 +482,20 @@ class PFTabsContainer(wx.Window):
|
|||||||
self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
|
self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
|
||||||
self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp)
|
self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp)
|
||||||
self.Bind(wx.EVT_MOTION, self.OnMotion)
|
self.Bind(wx.EVT_MOTION, self.OnMotion)
|
||||||
|
self.Bind(wx.EVT_SIZE, self.OnSize)
|
||||||
self.tabShadow = PFTabRenderer((self.tabMinWidth, self.height + 1), inclination = self.inclination)
|
self.tabShadow = PFTabRenderer((self.tabMinWidth, self.height + 1), inclination = self.inclination)
|
||||||
|
|
||||||
|
def OnSize(self, event):
|
||||||
|
self.UpdateSize()
|
||||||
|
event.Skip()
|
||||||
|
|
||||||
|
def UpdateSize(self):
|
||||||
|
width, dummy = self.GetSize()
|
||||||
|
if width != self.width:
|
||||||
|
self.width = width
|
||||||
|
self.tabContainerWidth = self.width - self.reserved
|
||||||
|
self.AdjustTabsSize()
|
||||||
|
|
||||||
def OnLeftDown(self, event):
|
def OnLeftDown(self, event):
|
||||||
mposx,mposy = event.GetPosition()
|
mposx,mposy = event.GetPosition()
|
||||||
if not self.startDrag:
|
if not self.startDrag:
|
||||||
@@ -705,10 +719,10 @@ class PFTabsContainer(wx.Window):
|
|||||||
posx, posy = tab.GetPosition()
|
posx, posy = tab.GetPosition()
|
||||||
if not tab.IsSelected():
|
if not tab.IsSelected():
|
||||||
mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True )
|
mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True )
|
||||||
img = tab.Render().ConvertToImage()
|
# img = tab.Render().ConvertToImage()
|
||||||
img = img.AdjustChannels(1, 1, 1, 0.8)
|
# img = img.AdjustChannels(1, 1, 1, 0.8)
|
||||||
bmp = wx.BitmapFromImage(img)
|
# bmp = wx.BitmapFromImage(img)
|
||||||
mdc.DrawBitmap(bmp, posx, posy, True)
|
mdc.DrawBitmap(tab.Render(), posx, posy, True)
|
||||||
else:
|
else:
|
||||||
selected = tab
|
selected = tab
|
||||||
if selected:
|
if selected:
|
||||||
@@ -743,7 +757,7 @@ class PFTabsContainer(wx.Window):
|
|||||||
fxBmp = self.tabShadow.Render()
|
fxBmp = self.tabShadow.Render()
|
||||||
|
|
||||||
simg = fxBmp.ConvertToImage()
|
simg = fxBmp.ConvertToImage()
|
||||||
simg.InitAlpha()
|
# simg.InitAlpha()
|
||||||
simg = simg.Blur(2)
|
simg = simg.Blur(2)
|
||||||
simg = simg.AdjustChannels(0.2,0.2,0.2,0.3)
|
simg = simg.AdjustChannels(0.2,0.2,0.2,0.3)
|
||||||
|
|
||||||
@@ -848,13 +862,14 @@ class PFTabsContainer(wx.Window):
|
|||||||
class MiniFrame(wx.Frame):
|
class MiniFrame(wx.Frame):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
wx.Frame.__init__(self, None, -1, 'MEGA Frame',
|
wx.Frame.__init__(self, None, -1, 'MEGA Frame',
|
||||||
size=(1000, 50), style = wx.FRAME_SHAPED)
|
size=(1000, 50))
|
||||||
self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
|
self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
|
||||||
# self.Bind(wx.EVT_PAINT, self.OnPaint)
|
# self.Bind(wx.EVT_PAINT, self.OnPaint)
|
||||||
# self.Bind(wx.EVT_ERASE_BACKGROUND,self.OnErase)
|
# self.Bind(wx.EVT_ERASE_BACKGROUND,self.OnErase)
|
||||||
# self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
|
# self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
|
||||||
# self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp)
|
# self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp)
|
||||||
# self.Bind(wx.EVT_MOTION, self.OnMotion)
|
# self.Bind(wx.EVT_MOTION, self.OnMotion)
|
||||||
|
self.Bind(wx.EVT_SIZE, self.OnSize)
|
||||||
self.SetBackgroundColour( (0xff,0xff,0xff))
|
self.SetBackgroundColour( (0xff,0xff,0xff))
|
||||||
|
|
||||||
self.drag = False
|
self.drag = False
|
||||||
@@ -865,7 +880,12 @@ class MiniFrame(wx.Frame):
|
|||||||
self.tabContainer.AddTab("Pyfa TAB #%d Aw" % i)
|
self.tabContainer.AddTab("Pyfa TAB #%d Aw" % i)
|
||||||
|
|
||||||
self.Refresh()
|
self.Refresh()
|
||||||
|
def OnSize(self, event):
|
||||||
|
size = self.GetRect()
|
||||||
|
self.tabContainer.SetSize((size.width, -1))
|
||||||
|
self.tabContainer.UpdateSize()
|
||||||
|
self.tabContainer.Refresh()
|
||||||
|
event.Skip()
|
||||||
def OnLeftDown(self, event):
|
def OnLeftDown(self, event):
|
||||||
event.Skip()
|
event.Skip()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user