[tekui-devel] tekui: Gauge, Slider: simplified and corrected draw(), no longer...

[Timm S. Mueller]

details:   http://hg.teklib.org/tekui/rev/d544ffe55c92
changeset: 9:d544ffe55c92
user:      Timm S. Mueller <tmueller at schulze-mueller.de>
date:      Thu Aug 28 12:40:33 2008 +0200
description:
Gauge, Slider: simplified and corrected draw(), no longer invokes
child:draw(); Stylesheet: page button hover effect added

diffs (95 lines):

diff -r 766fdd447f58 -r d544ffe55c92 tek/ui/class/gauge.lua
--- a/tek/ui/class/gauge.lua	Thu Aug 28 11:32:46 2008 +0200
+++ b/tek/ui/class/gauge.lua	Thu Aug 28 12:40:33 2008 +0200
@@ -45,7 +45,7 @@ local unpack = unpack
 local unpack = unpack
 
 module("tek.ui.class.gauge", tek.ui.class.numeric)
-_VERSION = "Gauge 4.2"
+_VERSION = "Gauge 4.3"
 
 -------------------------------------------------------------------------------
 -- Gauge:
@@ -200,24 +200,13 @@ end
 -------------------------------------------------------------------------------
 
 function Gauge:draw()
-
 	local d = self.Drawable
 	local r = self.Rect
 	local bg = Region.new(r[1], r[2], r[3], r[4])
-
-	local x0, y0, x1, y1 = self:getKnobRect()
-	local m = self.Child.MarginAndBorder
-	local kb1, kb2, kb3, kb4 = self.Child:getBorder()
-	x0 = x0 + m[1] - kb1
-	y0 = y0 + m[2] - kb2
-	x1 = x1 - m[3] + kb3
-	y1 = y1 - m[4] + kb4
-
-	if self.Value ~= self.Min then
-		bg:subRect(x0, y0, x1, y1)
-		self.Child:draw()
-	end
-
+	local c = self.Child
+	local r = c.Rect
+	local c1, c2, c3, c4 = c:getBorder()
+	bg:subRect(r[1] - c1, r[2] - c2, r[3] + c3, r[4] + c4)
 	local bgpen = d.Pens[self.Background]
 	for _, r1, r2, r3, r4 in bg:getRects() do
 		d:fillRect(r1, r2, r3, r4, bgpen)
diff -r 766fdd447f58 -r d544ffe55c92 tek/ui/class/slider.lua
--- a/tek/ui/class/slider.lua	Thu Aug 28 11:32:46 2008 +0200
+++ b/tek/ui/class/slider.lua	Thu Aug 28 12:40:33 2008 +0200
@@ -71,7 +71,7 @@ local min = math.min
 local min = math.min
 
 module("tek.ui.class.slider", tek.ui.class.numeric)
-_VERSION = "Slider 6.12"
+_VERSION = "Slider 6.13"
 
 -------------------------------------------------------------------------------
 --	Constants & Class data:
@@ -262,13 +262,11 @@ function Slider:draw()
 	local c = self.Child
 	r = c.Rect
 	local c1, c2, c3, c4 = c:getBorder()
-	c1, c2, c3, c4  = r[1] - c1, r[2] - c2, r[3] + c3, r[4] + c4
-	bg:subRect(c1, c2, c3, c4)
+	bg:subRect(r[1] - c1, r[2] - c2, r[3] + c3, r[4] + c4)
 	local bgpen = d.Pens[self.Background]
 	for _, r1, r2, r3, r4 in bg:getRects() do
 		d:fillRect(r1, r2, r3, r4, bgpen)
 	end
-	self.Child:draw()
 end
 
 -------------------------------------------------------------------------------
diff -r 766fdd447f58 -r d544ffe55c92 tek/ui/style/default.css
--- a/tek/ui/style/default.css	Thu Aug 28 11:32:46 2008 +0200
+++ b/tek/ui/style/default.css	Thu Aug 28 12:40:33 2008 +0200
@@ -1,10 +1,10 @@
 
 /*
-**	tek/ui/style/default.css - Default stylesheet for the tekUI toolkit
+**	tek/ui/style/default.css - tekUI default stylesheet
 **	Written by Timm S. Mueller <tmueller at schulze-mueller.de>
 **	See copyright notice in COPYRIGHT
 **
-**	Version: 1.0
+**	Version: 1.1
 */
 
 /* element classes: */
@@ -259,6 +259,10 @@ tek.ui.class.window {
 	background-color: hover;
 }
 
+.page-button:hover {
+	background-color: hover;
+}
+
 /* internal classes: */	
 
 _listviewheaditem {