From 51725ddb35776ad082c535cc04b48e6fc85e0d01 Mon Sep 17 00:00:00 2001 From: Corollax Date: Thu, 11 Nov 2010 05:15:14 -0600 Subject: [PATCH] Tiny readability/efficiency change to miniframe.py min(max()) to enforce variable range --- eos | 2 +- miniframe.py | 20 ++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/eos b/eos index 296e9159b..39c85374b 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 296e9159b68dcaff0fad30e0bfafb9a7ce623a36 +Subproject commit 39c85374b98bea389dfa159b32a1003aa4719105 diff --git a/miniframe.py b/miniframe.py index ba8fed819..748d9d7d2 100755 --- a/miniframe.py +++ b/miniframe.py @@ -123,12 +123,9 @@ class PFTabRenderer: g = bkG + scale b = bkB + scale - if r > 255: r = 255 - if r < 0: r = 0 - if g > 255: g = 255 - if g < 0: g = 0 - if b > 255: b = 255 - if b < 0: b = 0 + r = min(max(r,0),255)) + b = min(max(b,0),255)) + g = min(max(g,0),255)) return wx.Colour(r,b,g) @@ -369,12 +366,9 @@ class PFAddRenderer: g = bkG + scale b = bkB + scale - if r > 255: r = 255 - if r < 0: r = 0 - if g > 255: g = 255 - if g < 0: g = 0 - if b > 255: b = 255 - if b < 0: b = 0 + r = min(max(r,0),255) + b = min(max(b,0),255) + g = min(max(g,0),255) return wx.Colour(r,b,g) @@ -761,6 +755,8 @@ class PFTabsContainer(wx.Window): self.tabs[self.GetTabsCount() - 1].SetSelected(True) else: self.tabs[tab].SetSelected(True) + elif self.GetTabsCount() == 0: + self.Destroy() self.AdjustTabsSize() self.Refresh()