From 65af4f0c2123197e2b3098e4c4ada45fe65ae5aa Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Wed, 17 Nov 2010 02:16:01 +0200
Subject: [PATCH] pfnotebook tab render first draft

---
 gui/bitmapLoader.py  |   2 +-
 icons/ctabclose.png  | Bin 3006 -> 2954 bytes
 icons/ctableft.png   | Bin 3026 -> 2879 bytes
 icons/ctabmiddle.png | Bin 2821 -> 2814 bytes
 icons/ctabright.png  | Bin 3017 -> 2875 bytes
 miniframe.py         | 419 +++++++++++++++++++++++++------------------
 6 files changed, 248 insertions(+), 173 deletions(-)

diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
index 2535c5c74..0a95416aa 100644
--- a/gui/bitmapLoader.py
+++ b/gui/bitmapLoader.py
@@ -83,6 +83,6 @@ def getImage(name, location):
     else:
         location = os.path.join(config.pyfaPath, location)
         path = os.path.join(location, name + ".png")
-    
+
     if os.path.exists(path):
         return wx.Image(path)
diff --git a/icons/ctabclose.png b/icons/ctabclose.png
index 4a9ed9d32526e823db479f1619cb42b04ecc9b03..cccd9904d6ad409d1679c29fe4bc4570a74ada61 100644
GIT binary patch
delta 232
zcmV<E02lwh7m61liBL{Q4GJ0x0000DNk~Le00008000082nGNE0K^Zzi?JcC3V)|b
zL_t(|+GLNh4TCTM1P_b_VhaQkGo)k$OlP)m15~UPWdH^u5`-q7B9JC0UGvTV!<QRy
z2iDX3nE}w0Wx0CqWvx{l$MW8*uIm+O02b$*_I=kp&l-k7$8o6ddjSi;E6Xy45Ogt3
zlkz+laKwO&F<5J_O42mN7z6MISUuXd)wXRK$5A1Kzlx?Piq$!%BuNxSk-Dx^RaL){
i*Ubm;Jbhd@KLY^lMp2jp)Eb}w0000<MNUMnLSTZrQdtrJ

delta 284
zcmV+%0ptFP7rqxEiBL{Q4GJ0x0000DNk~Le0000C0000C2nGNE09JKe=dmHJ3V+*4
zL_t(|+LV$#YQ!)Qg+EdV3|pxZ1ayy_L6s_l!QdkWwp!RbxiT0Q1a21=0%-*=jpWF?
zX)-Xy4Bvw{KkyqT;1gH@m0U~j#8Z3#sR5re6$XHJ;0~zodwK77&^f1Z9BX|qEEhmA
zM&+E9Qj+&x&N(g1B1xL2sfsQDUvYq}wVLNylC*8x4zKGf=Uf$h(|T=1f4~Ct)=qAW
z!5FjGUDqAz8jm_)YooQ-EaCxh1r$P1&Uv@d+8c(U3a*E>h7b;(t+k3VzO41%hihNs
i4BQ&<R(ktu{0sn7TeU=o8^vz`0000<MNUMnLSTZln{zk-

diff --git a/icons/ctableft.png b/icons/ctableft.png
index 6a0a7248e6c136a7bfe2cd2a4c446e0a85f7f18c..164e3873d7a1af8cd5a8e7e309e8451fd7511dd7 100644
GIT binary patch
delta 133
zcmV;00DAw@7rz#e83+OZ001%eawxGOtqO5mNkl<Zc-mqVQZ`~B8Za@C0!UNMLZrHP
zch3=PHbf~=s^Lnh?Mq~XscJTw!PGMw(_k9MJQMNGpubCSIfKqF!Q%|d%*Jmp1!fa8
n7@?XNr3?%V3?!9RqyfMHeA^%}yid8n00000NkvXXu0mjfLyI#*

delta 282
zcmV+#0p<R`7Sb1x83+ad006#}<$tjutqOndNkl<Zc-p+vTS@~l6o>KOq=RLq*0$bn
zc!4Uo0yiM~Ag<46ci;~7C6Q2^ONw~lz(DxV_a!;0jIRnIc8yRK1Si-*6MI?}1RKn;
zioIKp2!}|V;|!PhObbKQ8Z#W>It9nn1bbNH1z&lG5!4p@I4!uDAL<=mH>rK(oVtI)
z@t;!r$N|&%g9C+Q*y09HUDPge8j2Z~L(|ixJQ(g$zQuE&@^9Knxs8XVMEie~H?@nD
zbM1T_7x5t!kK;Yw#waK4oVvte3AK))hZ1TcH!*yIixO&x@AVv4crOhv;yyoYQI942
g%)5#oTh;df>JL=vLb7Vk00000Nks-uM6N<$g8q+!GXMYp

diff --git a/icons/ctabmiddle.png b/icons/ctabmiddle.png
index 460859e37682ae9a1a2d287c8c5c7a896809842e..337e875cfeb40faf75762a8b8018e998ece8ac09 100644
GIT binary patch
delta 68
zcmZn_`zJa<l7oqXfkEHiY4%3NwOj_$o-U3d6}OTEg3OW{5~Y~a*x1;B@(lm~Gcz>s
VF<SNu-I)vGd%F6$taD0e0swqN5}W`4

delta 75
zcmew-+A20dl7o$bfnh=H)iWCv*K(OFdAc};RNOjp#88ldfrCZi9dpD1mT&wk3{x1i
fUL+(i^WSCI;KSH<#L$ofsExtX)z4*}Q$iB}u0a?B

diff --git a/icons/ctabright.png b/icons/ctabright.png
index 4ef9fcae1bd2def58f3fe253fe8620472fd7570b..cca1a8caef0846719b90c0c299d382181e868504 100644
GIT binary patch
delta 129
zcmV-{0Dk|;7rPda83+OZ001=uq7|_rtqN^eNkl<Zc-mqVQZ`~B0x&TU2Z&Y22%!kt
z4mI!H-E+j+i(e^O{=j1-x#5D#NNR^O7Ij#yrp#VUBkAA|tX5OQUSuQb<_|QhsckP&
jKuFn$s^&2;FaQPsCh!=^;2p?100000NkvXXu0mjfOsz66

delta 272
zcmV+r0q_317ReWo83+ad006pSHA1l=tqOnUNkl<Zc-oxQ!Ait17{u{ky0Qx^x>^xD
zsR#8Hd;w(-BKWAjk5|E~R}UI5QMzf<raLeYXomUnr^y0`I6z3A)B=}SrgiLiG<1)3
zYJ(qqj|D^L;|t#Lflqv;a8FHV{faA`XXhML%)G@7j??&~O@F#T+c{^bX^MElZK-^%
zDU5uU0;|%VSnva`)0m;A2~HBlWxj7L)M8Tt5=Z=uyBtU}@o%2uXb4E0a1TgRaT9t#
zYC?lRVug2r)HDqOiIx5bQrolxWS`I~Og$o*ws@P<B+*;X4Yk<J9S<JoHbK~@$?pK3
WphxQOG57)i0000<MNUMnLSTXomU_7W

diff --git a/miniframe.py b/miniframe.py
index 862cbee79..93c21b276 100755
--- a/miniframe.py
+++ b/miniframe.py
@@ -11,20 +11,39 @@
 import wx
 import copy
 import time
+from gui import bitmapLoader
 
 class PFTabRenderer:
-    def __init__(self, size = (36,24), text = wx.EmptyString, img = None, inclination = 6 , closeButton = True, fontSize = 8):
+    def __init__(self, size = (36,24), text = wx.EmptyString, img = None, inclination = 6 , closeButton = True, fontSize = 12):
 
         # tab left/right zones inclination
+        self.ctabLeft = bitmapLoader.getImage("ctableft", "icons")
+        self.ctabMiddle = bitmapLoader.getImage("ctabmiddle", "icons")
+        self.ctabRight = bitmapLoader.getImage("ctabright", "icons")
+        self.ctabClose = bitmapLoader.getImage("ctabclose", "icons")
+
+        self.leftWidth = self.ctabLeft.GetWidth()
+        self.rightWidth = self.ctabRight.GetWidth()
+        self.middleWidth = self.ctabMiddle.GetWidth()
+        self.closeBtnWidth  = self.ctabClose.GetWidth()
+
+        width, height = size
+        if width < self.leftWidth + self.rightWidth + self.middleWidth:
+            width = self.leftWidth + self.rightWidth + self.middleWidth
+        if height < self.ctabMiddle.GetHeight():
+            height = self.ctabMiddle.GetHeight()
+
         self.inclination = inclination
         self.text = text
         self.img = img
-        self.tabSize = size
+        self.tabSize = (width, height)
+        print self.tabSize
         self.closeButton = closeButton
         self.fontSize = fontSize
         self.selected = False
         self.closeBtnHovering = False
         self.tabBitmap = None
+        self.tabBackBitmap = None
         self.cbSize = 5
         self.position = (0, 0) # Not used internaly for rendering - helper for tab container
         self.InitTab()
@@ -40,17 +59,20 @@ class PFTabRenderer:
 
     def SetSize(self, size):
         otw,oth = self.tabSize
-        self.tabSize = size
-        w,h = self.tabSize
-        if h != oth:
-            self.InitTab(True)
-        else:
-            self.InitTab()
+        w,h = size
+        if w< self.leftWidth + self.rightWidth + self.middleWidth:
+            w = self.leftWidth + self.rightWidth + self.middleWidth
+        if h < self.ctabMiddle.GetHeight():
+            h = self.ctabMiddle.GetHeight()
+
+        self.tabSize = (w,h)
+
+        self.InitTab()
 
     def SetSelected(self, sel = True):
         self.selected = sel
-        self.InitColors()
-        self._Render()
+        self.InitTab()
+#        self._Render()
 
     def GetSelected(self):
         return self.selected
@@ -80,7 +102,7 @@ class PFTabRenderer:
         mdc.SelectObject(ebmp)
         mdc.SetFont(self.font)
         textSizeX, textSizeY = mdc.GetTextExtent(self.text)
-        totalSize = self.lrZoneWidth * 2 + textSizeX + self.cbSize*2 if self.closeButton else 0
+        totalSize = self.leftWidth + self.rightWidth + textSizeX + self.closeBtnWidth
         mdc.SelectObject(wx.NullBitmap)
         return (totalSize, self.tabHeight)
 
@@ -98,27 +120,81 @@ class PFTabRenderer:
 
         # content width is tabWidth - (left+right) zones
 
-        self.contentWidth = self.tabWidth - self.inclination * 6 - self.cbSize if self.closeButton else 0
-
-        self.leftZoneSpline = []
-        self.rightZoneSpline = []
-
-        self.lrZoneWidth = self.inclination * 3
-        if not skipLRzones:
-            self.CreateLRZoneSplines()
-
-            self.leftRegion = self.CreateLeftRegion()
-            self.rightRegion = self.CreateRightRegion()
-
-        self.contentRegion = wx.Region(0, 0, self.contentWidth, self.tabHeight)
+        self.contentWidth = self.tabWidth - self.leftWidth - self.rightWidth
         self.tabRegion = None
         self.closeBtnRegion = None
-        self.font = wx.Font(self.fontSize, wx.SWISS, wx.NORMAL, wx.NORMAL, False)
 
-        self.InitTabRegions()
+#        self.leftZoneSpline = []
+#        self.rightZoneSpline = []
+#
+#        self.lrZoneWidth = self.inclination * 3
+#        if not skipLRzones:
+#            self.CreateLRZoneSplines()
+#
+#            self.leftRegion = self.CreateLeftRegion()
+#            self.rightRegion = self.CreateRightRegion()
+
+
+        self.font = wx.FontFromPixelSize((0, self.fontSize), wx.SWISS, wx.NORMAL, wx.NORMAL, False)
+
         self.InitColors()
+        self.InitBitmaps()
+
+        self.ComposeTabBack()
+        self.InitTabRegions()
         self._Render()
 
+    def InitBitmaps(self):
+        print self.selected
+        if self.selected:
+            tr,tg,tb = self.tabColor
+            print "sel"
+        else:
+            tr,tg,tb = self.leftColor
+            print "nsel"
+        print tr,tg,tb
+        print self.tabColor, self.rightColor
+        ctabLeft = self.ctabLeft.Copy()
+        ctabRight = self.ctabRight.Copy()
+        ctabMiddle = self.ctabMiddle.Copy()
+        ctabLeft.Replace(0,0,0,tr, tg, tb)
+        ctabRight.Replace(0,0,0,tr, tg, tb)
+        ctabMiddle.Replace(0,0,0,tr, tg, tb)
+        self.ctabLeftBmp = wx.BitmapFromImage(ctabLeft)
+        self.ctabRightBmp = wx.BitmapFromImage(ctabRight)
+        self.ctabMiddleBmp = wx.BitmapFromImage(ctabMiddle)
+        self.ctabCloseBmp = wx.BitmapFromImage(self.ctabClose)
+
+
+
+    def ComposeTabBack(self):
+        bkbmp = wx.EmptyBitmap(self.tabWidth, self.tabHeight)
+        print self.tabWidth, self.contentWidth, self.leftWidth, self.rightWidth
+        mdc = wx.MemoryDC()
+        mdc.SelectObject(bkbmp)
+        mdc.SetBackground( wx.Brush((0x12,0x23,0x32)))
+        mdc.Clear()
+        mdc.DrawBitmap(self.ctabLeftBmp, 0, 0)
+        cm = self.ctabMiddleBmp.ConvertToImage()
+        mimg = cm.Scale(self.contentWidth, self.ctabMiddle.GetHeight(), wx.IMAGE_QUALITY_NORMAL)
+        mbmp = wx.BitmapFromImage(mimg)
+        mdc.DrawBitmap(mbmp, self.leftWidth, 0 )
+        mdc.DrawBitmap(self.ctabRightBmp, self.contentWidth + self.leftWidth, 0 )
+        mdc.SelectObject(wx.NullBitmap)
+        bkbmp.SetMaskColour( (0x12, 0x23, 0x32) )
+        if self.tabBackBitmap:
+            del self.tabBackBitmap
+
+        self.tabBackBitmap = bkbmp
+        img = bkbmp.ConvertToImage()
+        img.SaveFile("test.png", wx.BITMAP_TYPE_PNG)
+
+    def InitTabRegions(self):
+        self.tabRegion = wx.RegionFromBitmap(self.tabBackBitmap)
+        self.closeBtnRegion = wx.RegionFromBitmap(self.ctabCloseBmp)
+        self.closeBtnRegion.Offset(self.contentWidth+self.leftWidth - self.ctabCloseBmp.GetWidth()/2, (self.tabHeight - self.ctabCloseBmp.GetHeight())/2)
+
+
     def InitColors(self):
         self.tabColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
         self.leftColor = self.CalculateColor(self.tabColor, 0x2F)
@@ -140,95 +216,82 @@ class PFTabRenderer:
         b = min(max(b,0),255)
         g = min(max(g,0),255)
 
-        return wx.Colour(r,g,b)
+        return wx.Colour(r,g,b,255)
 
-    def InitTabRegions(self):
-        self.tabRegion = wx.Region(0, 0, self.tabWidth, self.tabHeight)
-        self.tabRegion.IntersectRegion(self.leftRegion)
-
-        self.contentRegion.Offset(self.lrZoneWidth, 0)
-        self.tabRegion.UnionRegion(self.contentRegion)
-
-        self.rightRegion.Offset(self.tabWidth - self.lrZoneWidth, 0)
-        self.tabRegion.UnionRegion(self.rightRegion)
-        self.closeBtnRegion = wx.Region(self.tabWidth - self.lrZoneWidth - self.cbSize -2 , (self.tabHeight - self.cbSize) / 2 - 2, self.cbSize + 4, self.cbSize + 4)
-        cbtRegion = wx.Region(self.tabWidth - self.lrZoneWidth - self.cbSize ,0, self.cbSize, self.tabHeight)
-        self.tabRegion.UnionRegion(cbtRegion)
-
-    def CreateLRZoneSplines(self):
-        height = self.tabHeight
-        inc = self.inclination
-
-        self.leftZoneSpline = [wx.Point(0, height), wx.Point(inc * 2/3, height - inc/2), wx.Point(inc+inc/2, 2),
-                 wx.Point(inc * 3, 0)]
-        self.rightZoneSpline = [wx.Point(0, 0), wx.Point(inc+inc/2,2),wx.Point(inc*2 +inc*2/3,height-inc/2), wx.Point(inc*3,height) ]
-
-    def CreateLeftRegion(self):
-
-        width = self.lrZoneWidth + 1
-        height = self.tabHeight + 1
-        inc = self.inclination
-
-        mdc = wx.MemoryDC()
-
-        mbmp = wx.EmptyBitmap(width,height,24)
-        mdc.SelectObject(mbmp)
-
-        mdc.SetBackground( wx.Brush((123,123,123)))
-        mdc.Clear()
-
-        mdc.SetPen( wx.Pen("#000000", width = 1 ) )
-        mdc.DrawSpline(self.leftZoneSpline)
-
-        mdc.SetBrush(wx.Brush(wx.Colour(255,255,0), wx.SOLID))
-        ret = mdc.FloodFill(inc*2,height-inc, wx.Color(123,123,123), wx.FLOOD_SURFACE)
-        if not ret:
-            print "FloodFill failed"
-
-        mdc.SelectObject(wx.NullBitmap)
-
-#        mbmp.SetMaskColour( (123, 123, 123) )
-
-        region = wx.Region()
-        region.UnionBitmapColour(mbmp, wx.Colour(123,123,123))
-        region.Offset(-1,0)
-
-        return region
-
-    def CreateRightRegion(self):
-
-        width = self.lrZoneWidth + 1
-        height = self.tabHeight
-        inc = self.inclination
-
-        mdc = wx.MemoryDC()
-
-        mbmp = wx.EmptyBitmap(width,height,24)
-        mdc.SelectObject(mbmp)
-
-        mdc.SetBackground( wx.Brush((123,123,123), wx.SOLID))
-        mdc.Clear()
-
-        mdc.SetPen( wx.Pen("#000000", width = 1 ) )
-        mdc.DrawSpline(self.rightZoneSpline)
-
-        mdc.SetBrush(wx.Brush(wx.Colour(255,255,0)))
-        ret = mdc.FloodFill(inc,height-inc, wx.Color(123,123,123), wx.FLOOD_SURFACE)
-        if not ret:
-            print "FloodFill failed"
-        mdc.SelectObject(wx.NullBitmap)
-
-        region = wx.Region()
-        region.UnionBitmapColour(mbmp, wx.Colour(123,123,123))
-
-        return region
-
-    def OffsetPointList(self, list , x, y):
-        tlist = []
-        for i in list:
-            tlist.append(wx.Point(i.x + x, i.y + y))
-
-        return tlist
+#    def CreateLRZoneSplines(self):
+#        height = self.tabHeight
+#        inc = self.inclination
+#
+#        self.leftZoneSpline = [wx.Point(0, height), wx.Point(inc * 2/3, height - inc/2), wx.Point(inc+inc/2, 2),
+#                 wx.Point(inc * 3, 0)]
+#        self.rightZoneSpline = [wx.Point(0, 0), wx.Point(inc+inc/2,2),wx.Point(inc*2 +inc*2/3,height-inc/2), wx.Point(inc*3,height) ]
+#
+#    def CreateLeftRegion(self):
+#
+#        width = self.lrZoneWidth + 1
+#        height = self.tabHeight + 1
+#        inc = self.inclination
+#
+#        mdc = wx.MemoryDC()
+#
+#        mbmp = wx.EmptyBitmap(width,height,24)
+#        mdc.SelectObject(mbmp)
+#
+#        mdc.SetBackground( wx.Brush((123,123,123)))
+#        mdc.Clear()
+#
+#        mdc.SetPen( wx.Pen("#000000", width = 1 ) )
+#        mdc.DrawSpline(self.leftZoneSpline)
+#
+#        mdc.SetBrush(wx.Brush(wx.Colour(255,255,0), wx.SOLID))
+#        ret = mdc.FloodFill(inc*2,height-inc, wx.Color(123,123,123), wx.FLOOD_SURFACE)
+#        if not ret:
+#            print "FloodFill failed"
+#
+#        mdc.SelectObject(wx.NullBitmap)
+#
+##        mbmp.SetMaskColour( (123, 123, 123) )
+#
+#        region = wx.Region()
+#        region.UnionBitmapColour(mbmp, wx.Colour(123,123,123))
+#        region.Offset(-1,0)
+#
+#        return region
+#
+#    def CreateRightRegion(self):
+#
+#        width = self.lrZoneWidth + 1
+#        height = self.tabHeight
+#        inc = self.inclination
+#
+#        mdc = wx.MemoryDC()
+#
+#        mbmp = wx.EmptyBitmap(width,height,24)
+#        mdc.SelectObject(mbmp)
+#
+#        mdc.SetBackground( wx.Brush((123,123,123), wx.SOLID))
+#        mdc.Clear()
+#
+#        mdc.SetPen( wx.Pen("#000000", width = 1 ) )
+#        mdc.DrawSpline(self.rightZoneSpline)
+#
+#        mdc.SetBrush(wx.Brush(wx.Colour(255,255,0)))
+#        ret = mdc.FloodFill(inc,height-inc, wx.Color(123,123,123), wx.FLOOD_SURFACE)
+#        if not ret:
+#            print "FloodFill failed"
+#        mdc.SelectObject(wx.NullBitmap)
+#
+#        region = wx.Region()
+#        region.UnionBitmapColour(mbmp, wx.Colour(123,123,123))
+#
+#        return region
+#
+#    def OffsetPointList(self, list , x, y):
+#        tlist = []
+#        for i in list:
+#            tlist.append(wx.Point(i.x + x, i.y + y))
+#
+#        return tlist
 
     def Render(self):
         return self.tabBitmap
@@ -237,10 +300,10 @@ class PFTabRenderer:
         if self.tabBitmap:
             del self.tabBitmap
 
-        inc = self.lrZoneWidth
+        inc = 6
         height = self.tabHeight
         width = self.tabWidth
-        contentWidth = self.contentWidth + self.cbSize if self.closeButton else 0
+        contentWidth = self.contentWidth
 
         rect = wx.Rect(0,0,self.tabWidth, self.tabHeight)
 
@@ -249,50 +312,54 @@ class PFTabRenderer:
         mdc = wx.MemoryDC()
 
         mdc.SelectObject(canvas)
-        mdc.SetBackground(wx.Brush ((13,22,31)))
+        mdc.SetBackground(wx.Brush ((0x12,0x23,0x32)))
         mdc.Clear()
-        mdc.DestroyClippingRegion()
-        mdc.SetClippingRegionAsRegion(self.tabRegion)
+
+#        mdc.SetBackground(wx.Brush ((13,22,31)))
+#        mdc.Clear()
+#        mdc.DestroyClippingRegion()
+#        mdc.SetClippingRegionAsRegion(self.tabRegion)
 
         r = copy.copy(rect)
         r.top = r.left = 0
         r.height = height
-
-        mdc.GradientFillLinear(r,self.gradientStartColor,self.tabColor,wx.SOUTH)
-        mdc.SetPen( wx.Pen(self.leftColor, width = 1 ) )
-
-        dpleft = self.OffsetPointList(self.leftZoneSpline, -1, 0)
-        dpright = self.OffsetPointList(self.rightZoneSpline, inc + contentWidth, 0)
-
-        mdc.DrawSpline(dpleft)
-        mdc.SetPen( wx.Pen(self.rightColor, width = 1 ) )
-        mdc.DrawSpline(dpright)
-
-        lrect = wx.Rect()
-        lrect.left=inc - 1
-        lrect.top=0
-        lrect.width = contentWidth+1
-        lrect.height = 1
-        mdc.GradientFillLinear(lrect,self.leftColor,self.rightColor, wx.EAST)
-#        if not self.selected:
-#            mdc.DrawLine(0,height - 1,width,height - 1)
-        mdc.SetPen( wx.Pen(self.rightColor, width = 1 ) )
-        if self.closeButton:
-            cbsize = self.cbSize
-
-            cbx = width - self.lrZoneWidth-cbsize
-            cby = (height - cbsize)/2
-            if self.closeBtnHovering:
-                mdc.SetPen( wx.Pen( wx.Colour(255,22,22), 0))
-                mdc.SetBrush(wx.Brush(wx.Colour(255,22,22)))
-                mdc.DrawCircle(cbx + cbsize / 2 +1, cby + cbsize / 2 + 1, cbsize)
-                selColor = self.CalculateColor(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT), 255)
-                mdc.SetPen( wx.Pen( selColor, 1))
-
-            mdc.DrawLine(cbx, cby, cbx + cbsize + 1 , cby + cbsize + 1 )
-            mdc.DrawLine(cbx, cby + cbsize, cbx + cbsize + 1, cby - 1 )
-
-        mdc.SetClippingRegionAsRegion(self.contentRegion)
+        mdc.DrawBitmap(self.tabBackBitmap, 0, 0, True)
+#
+##        mdc.GradientFillLinear(r,self.gradientStartColor,self.tabColor,wx.SOUTH)
+##        mdc.SetPen( wx.Pen(self.leftColor, width = 1 ) )
+##
+##        dpleft = self.OffsetPointList(self.leftZoneSpline, -1, 0)
+##        dpright = self.OffsetPointList(self.rightZoneSpline, inc + contentWidth, 0)
+##
+##        mdc.DrawSpline(dpleft)
+##        mdc.SetPen( wx.Pen(self.rightColor, width = 1 ) )
+##        mdc.DrawSpline(dpright)
+##
+##        lrect = wx.Rect()
+##        lrect.left=inc - 1
+##        lrect.top=0
+##        lrect.width = contentWidth+1
+##        lrect.height = 1
+##        mdc.GradientFillLinear(lrect,self.leftColor,self.rightColor, wx.EAST)
+###        if not self.selected:
+###            mdc.DrawLine(0,height - 1,width,height - 1)
+##        mdc.SetPen( wx.Pen(self.rightColor, width = 1 ) )
+##        if self.closeButton:
+##            cbsize = self.cbSize
+##
+##            cbx = width - self.lrZoneWidth-cbsize
+##            cby = (height - cbsize)/2
+##            if self.closeBtnHovering:
+##                mdc.SetPen( wx.Pen( wx.Colour(255,22,22), 0))
+##                mdc.SetBrush(wx.Brush(wx.Colour(255,22,22)))
+##                mdc.DrawCircle(cbx + cbsize / 2 +1, cby + cbsize / 2 + 1, cbsize)
+##                selColor = self.CalculateColor(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT), 255)
+##                mdc.SetPen( wx.Pen( selColor, 1))
+##
+##            mdc.DrawLine(cbx, cby, cbx + cbsize + 1 , cby + cbsize + 1 )
+##            mdc.DrawLine(cbx, cby + cbsize, cbx + cbsize + 1, cby - 1 )
+##
+##        mdc.SetClippingRegionAsRegion(self.contentRegion)
         mdc.SetFont(self.font)
         text = self.text
         fnwidths = mdc.GetPartialTextExtents(text)
@@ -314,12 +381,18 @@ class PFTabRenderer:
         else:
             color = self.CalculateColor(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT), 0x44)
             mdc.SetTextForeground(color)
-        mdc.DrawText(text, inc, height / 2 - ty / 2)
-
-        mdc.DestroyClippingRegion()
+        mdc.DrawText(text, self.leftWidth, height / 2 - ty / 2)
 
+#        mdc.DestroyClippingRegion()
+        if self.closeBtnHovering:
+            mdc.DrawBitmap(self.ctabCloseBmp,self.contentWidth+self.leftWidth - self.ctabCloseBmp.GetWidth()/2,(height - self.ctabCloseBmp.GetHeight())/2)
+        else:
+            cimg = self.ctabCloseBmp.ConvertToImage()
+            cimg = cimg.AdjustChannels(0.7,0.7,0.7,0.3)
+            cbmp = wx.BitmapFromImage(cimg)
+            mdc.DrawBitmap(cbmp,self.contentWidth+self.leftWidth - self.ctabCloseBmp.GetWidth()/2,(height - self.ctabCloseBmp.GetHeight())/2)
         mdc.SelectObject(wx.NullBitmap)
-        canvas.SetMaskColour((13,22,31))
+        canvas.SetMaskColour((0x12,0x23,0x32))
 #        if not self.selected:
 #            img = canvas.ConvertToImage()
 #            img = img.AdjustChannels(1, 1, 1, 0.8)
@@ -719,7 +792,7 @@ class PFTabsContainer(wx.Window):
 
     def OnPaint(self, event):
         rect = self.GetRect()
-        canvas = wx.EmptyBitmap(rect.width, rect.height,24)
+        canvas = wx.EmptyBitmap(rect.width, rect.height)
         mdc = wx.BufferedPaintDC(self)
         mdc.SelectObject(canvas)
 
@@ -746,10 +819,10 @@ class PFTabsContainer(wx.Window):
 
         for i in xrange(len(self.tabs) - 1, -1, -1):
             tab = self.tabs[i]
-            width = tab.tabWidth - self.inclination*2
+            width = tab.tabWidth - 6
             posx, posy  = tab.GetPosition()
             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 = img.AdjustChannels(1, 1, 1, 0.8)
 #                bmp = wx.BitmapFromImage(img)
@@ -758,7 +831,7 @@ class PFTabsContainer(wx.Window):
                 selected = tab
         if selected:
             posx, posy  = selected.GetPosition()
-#            mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True)
+            mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True)
             bmp = selected.Render()
 #            if self.dragging:
 #                img = bmp.ConvertToImage()
@@ -773,8 +846,8 @@ class PFTabsContainer(wx.Window):
             offset = 1
         else:
             offset = 0
-        r1 = wx.Rect(0,self.containerHeight-1,selpos,1)
-        r2 = wx.Rect(selpos + selWidth - offset, self.containerHeight -1, self.width - selpos - selWidth,1)
+        r1 = wx.Rect(0,self.containerHeight,selpos,1)
+        r2 = wx.Rect(selpos + selWidth - offset, self.containerHeight , self.width - selpos - selWidth,1)
         mdc.GradientFillLinear(r1, startColor, selColor, wx.EAST)
         mdc.GradientFillLinear(r2, selColor, startColor, wx.EAST)
 
@@ -788,10 +861,10 @@ class PFTabsContainer(wx.Window):
             fxBmp = self.tabShadow.Render()
 
             simg = fxBmp.ConvertToImage()
-#            if not simg.HasAlpha():
-#                simg.InitAlpha()
-#            simg = simg.Blur(2)
-#            simg = simg.AdjustChannels(0.2,0.2,0.2,0.3)
+            if not simg.HasAlpha():
+                simg.InitAlpha()
+            simg = simg.Blur(2)
+            simg = simg.AdjustChannels(0.2,0.2,0.2,0.3)
 
             self.efxBmp = wx.BitmapFromImage(simg)
 
@@ -982,17 +1055,19 @@ class MiniFrame(wx.Frame):
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         self.nb = PFNotebook(self)
 
+        mainSizer.Add(self.nb,1,wx.EXPAND)
+        self.SetSizer(mainSizer)
+
         self.nb.AddPage(TestPanel(self),"TEST 1")
         self.nb.AddPage(TestPanel(self),"TEST 2")
         self.nb.AddPage(TestPanel(self),"TEST 3")
         self.nb.AddPage(TestPanel(self),"TEST 4")
-        self.nb.AddPage(TestPanel(self),"TEST 5")
+        self.nb.AddPage(TestPanel(self),"TEST 5WWWWWWWWWWWWWWWWWWWWWWWWWW")
         self.nb.AddPage(TestPanel(self),"TEST 6")
 
-        mainSizer.Add(self.nb,1,wx.EXPAND)
-        self.SetSizer(mainSizer)
         self.Layout()
 
+
 #    def OnSize(self, event):
 #        size = self.GetRect()
 #        self.tabContainer.SetSize((size.width, -1))