From 4983da8c31a08d8965e80bc60754ce17d5cd6ee1 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Wed, 17 Nov 2010 23:51:35 +0200 Subject: [PATCH] A little tweak here and there --- gui/chromeTabs.py | 28 ++++++++++++++++++++++++++-- icons/ctabadd.png | Bin 3367 -> 3271 bytes 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py index 4df46b765..03cf3f2ef 100644 --- a/gui/chromeTabs.py +++ b/gui/chromeTabs.py @@ -531,6 +531,7 @@ class PFAddRenderer: self.addBitmap = None self.position = (0,0) + self.highlighted = False self.InitRenderer() @@ -587,6 +588,10 @@ class PFAddRenderer: return wx.Colour(r,b,g) + def Highlight(self, highlight = False): + self.highlighted = highlight + self._Render() + def Render(self): return self.addBitmap @@ -609,7 +614,11 @@ class PFAddRenderer: # img = canvas.ConvertToImage() # if not img.HasAlpha(): # img.InitAlpha() - img = self.addImg.AdjustChannels(1, 1, 1, 0.2) + if self.highlighted: + alpha = 1 + else: + alpha = 0.3 + img = self.addImg.AdjustChannels(1, 1, 1, alpha) bbmp = wx.BitmapFromImage(img) self.addBitmap = bbmp @@ -899,8 +908,23 @@ class PFTabsContainer(wx.Panel): return self.CheckCloseButtons(mposx, mposy) + self.CheckAddHighlighted(mposx,mposy) + event.Skip() + def CheckAddHighlighted(self, mposx, mposy): + if not self.showAddButton: + return + reg = self.addButton.GetRegion() + ax,ay = self.addButton.GetPosition() + reg.Offset(ax,ay) + if reg.Contains(mposx, mposy): + self.addButton.Highlight(True) + else: + self.addButton.Highlight(False) + + self.Refresh() + def OnPaint(self, event): rect = self.GetRect() canvas = wx.EmptyBitmap(rect.width, rect.height) @@ -928,7 +952,7 @@ class PFTabsContainer(wx.Panel): pos = tabsWidth if self.showAddButton: ax,ay = self.addButton.GetPosition() - mdc.DrawBitmap(self.addBitmap, ax, ay, True) + mdc.DrawBitmap(self.addButton.Render(), ax, ay, True) for i in xrange(len(self.tabs) - 1, -1, -1): tab = self.tabs[i] diff --git a/icons/ctabadd.png b/icons/ctabadd.png index 4d01602835f64b756f4f4e6995aeb194c69fce0d..2dadcd61bdaf739b48baa31cb2bd17f4a6f4a7dd 100644 GIT binary patch delta 552 zcmV+@0@wYg8pjzSiBL{Q4GJ0x0000DNk~Le0000I0000A2nGNE0J%#Jp|K&X3V#9Q zNkl8m;lUtK3^3=+!B$ewRV(JP8`Qh9LLUJFmSrv zu2ZYkobh;UuU0F2v)NR`F#Ne*ufGD2X`*C0oqpQy_tR#xc`Jl~Wm!;4L4PTQY&LsI zHk-{51OcR!*zINYz6Gu_RlgWh3 z^a0qo!UWI*@B;u75&w_HV!`(b7{FTqWjw$y7K`tF-{(rD!lhD)3x&c( zuv{+L^Snz5A=q`@Ie;es41McL6yp0HmIF4N@ qC8y6wL>E!Yz0e|}U$$+Z{|x{yg$ASbn-nGh0000SojB6#v)~! zpjetl#Ma6pAXuCbP>g}iUG^mI&h5{!NG{wSrzZNEnPI-n=ka~>o-oEBgs_1+-~xhw ziv&0WMu3^TP#5c5yWM^>%>tQGY@Rgt#6{N;x__JbdE&{s9orf`}wZ<`x$h?^>3H zloBZ=mStgC)|Ek7mVNPk|MBl2`uO;Ge_>&vE2R`tN*u?*w(U!p5Q4qEz0#u_8ylB< zV+_m7%N^huFqpJ#42k>w{>Ly3KR26APbr1tI8>|E5@t{G#<^PD6}*xcMiDaG#YZt3xEw_B=7 zQ52+UN~6)Z54-?=0!B?G74`f5{rUO%M`@bY<2WV^LmbCJDMglLCGpA0N$G5i8Ee|E z>#k_6zXRDcBrA%-4}#!*nx-ACb?Gawudn~nHe<{fRB5$Z546^wfL@`Rp&f={_{td5 z(ORRFx>jS3ZOik#13U+Q%z})PBzb3y`CwVrEg^&$H{(@DjX95+l+w=g9C0xqr*&1} j1~B&@12Y0n0sU(LyZs9ZJP@7E00000NkvXXu0mjf(kw2*