[tekui-devel] tekui: Layouter: processing unfilled elements with max. size bug...

Timm S. Mueller tmueller at neoscientists.org
Mon Apr 7 03:42:23 CEST 2008


details:   http://hg.teklib.org/tekui/rev/55ffa190618c
changeset: 404:55ffa190618c
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Thu Apr 03 12:59:11 2008 +0200
description:
Layouter: processing unfilled elements with max. size bug fixed; corrected a
few demos

diffs (50 lines):

diff -r fea98720bf39 -r 55ffa190618c tek/app/ui/demo.lua
--- a/tek/app/ui/demo.lua	Tue Apr 01 10:53:57 2008 +0200
+++ b/tek/app/ui/demo.lua	Thu Apr 03 12:59:11 2008 +0200
@@ -264,7 +264,7 @@ ui.Application:new
 							MaxWidth = ui.HUGE,
 							AutoWidth = true,
 							KeepMinWidth = true,
-							VSliderMode = "auto",
+							VSliderMode = "on",
 							Children =
 							{
 								ui.Group:new
diff -r fea98720bf39 -r 55ffa190618c tek/app/ui/pop.lua
--- a/tek/app/ui/pop.lua	Tue Apr 01 10:53:57 2008 +0200
+++ b/tek/app/ui/pop.lua	Thu Apr 03 12:59:11 2008 +0200
@@ -8,7 +8,8 @@ local success, state = ui.application:ne
 	Children = {
 		ui.window:new {
 			Children = {
-				ui.menubar:new {
+				ui.group:new {
+					Style = "menubar",
 					Children = {
 						ui.menuitem:new { Label = "Eins",
 							Children = {
diff -r fea98720bf39 -r 55ffa190618c tek/app/ui/tabs.lua
--- a/tek/app/ui/tabs.lua	Tue Apr 01 10:53:57 2008 +0200
+++ b/tek/app/ui/tabs.lua	Thu Apr 03 12:59:11 2008 +0200
@@ -9,7 +9,8 @@ ui.application:new {
 		ui.window:new {
 			Children = {
 
-				ui.menubar:new {
+				ui.group:new {
+					Style = "menubar",
 					Children = {
 						ui.menuitem:new {
 							Label = "File",
diff -r fea98720bf39 -r 55ffa190618c tek/class/ui/layout/default.lua
--- a/tek/class/ui/layout/default.lua	Tue Apr 01 10:53:57 2008 +0200
+++ b/tek/class/ui/layout/default.lua	Thu Apr 03 12:59:11 2008 +0200
@@ -150,7 +150,7 @@ function DefaultLayout:layoutAxis(group,
 			rest = rest - delta
 
 			-- element not completely filled?
-			if not c[3] or c[3] >= HUGE then -- maxs
+			if not c[3] or c[3] >= HUGE or c[5] < c[3] then -- maxs
 				-- redo in next iteration:
 				insert(e2, c)
 			end


More information about the tekui-devel mailing list