Revision: 3519
http://vexi.svn.sourceforge.net/vexi/?rev=3519&view=rev
Author: clrg
Date: 2009-06-22 01:47:11 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
Couple of bugfixes including height adjustment for an option near the bottom of
a frame
Modified Paths:
--------------
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/combo.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/item.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/option.t
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/combo.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/combo.t
2009-06-08 21:13:56 UTC (rev 3518)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/combo.t
2009-06-22 01:47:11 UTC (rev 3519)
@@ -56,7 +56,8 @@
$content.height ++= function(v) {
// FIXME: this is all a bit of a hack really - do it properly
if (!popped) { cascade = v; return true; }
- var newh =
surface.frame.height-surface.frame.distanceto($popbox).y;
+ var f = surface.frame;
+ var newh = f.height-f.distanceto($popbox).y;
if ($scroll.scrollvertical)
newh = maxlistheight>newh ? newh : maxlistheight;
$scroll.minheight = v>newh ? newh : v;
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/item.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/item.t
2009-06-08 21:13:56 UTC (rev 3518)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/item.t
2009-06-22 01:47:11 UTC (rev 3519)
@@ -1,6 +1,7 @@
<!-- Copyright 2008 - see COPYING for details [LGPL] -->
-<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta"
xmlns="org.vexi.lib.widget" xmlns:theme="vexi.theme">
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="org.vexi.lib.widget"
+ xmlns:theme="vexi.theme">
<meta:doc>
<author>Charles Goodwin</author>
</meta:doc>
@@ -22,10 +23,10 @@
cascade = v;
if (trapee.selected) {
trapee.v_fillbox.fill = "#0a246a";
- trapee.v_textbox.textcolor = "white";
+ trapee.v_textbox.textcolor = theme.settings..textcolor_selected;
} else {
trapee.v_fillbox.fill = null;
- trapee.v_textbox.textcolor = "black";
+ trapee.v_textbox.textcolor = trapee.enabled ?
theme.settings..textcolor : theme.settings..textcolor_disabled;
}
}
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/option.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/option.t
2009-06-08 21:13:56 UTC (rev 3518)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/option.t
2009-06-22 01:47:11 UTC (rev 3519)
@@ -41,6 +41,12 @@
thisbox.popdown ++= static.popdownWrite;
thisbox.width ++= static.widthWrite;
+ thisbox.v_container ++= function(v) {
+ cascade = v;
+ v_fillbox = $focus;
+ v_textbox = $output;
+ }
+
// pointer back to thisbox for static traps
$popbox.p_option = thisbox;
@@ -50,7 +56,8 @@
$content.height ++= function(v) {
// FIXME: this is all a bit of a hack really - do it properly
if (!popped) { cascade = v; return true; }
- var newh =
surface.frame.height-surface.frame.distanceto($popbox).y;
+ var f = surface.frame;
+ var newh = f.height-f.distanceto($popbox).y;
if ($scroll.scrollvertical)
newh = maxlistheight>newh ? newh : maxlistheight;
$scroll.minheight = v>newh ? newh : v;
@@ -67,12 +74,6 @@
vexi.math.min(dy+height-marginbottom, sh-v_popbox.height);
}
- thisbox.v_container ++= function(v) {
- cascade = v;
- v_fillbox = $focus;
- v_textbox = $output;
- }
-
</lib:widget.option>
<finalize />
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
