Revision: 2610
http://vexi.svn.sourceforge.net/vexi/?rev=2610&view=rev
Author: clrg
Date: 2007-11-22 18:19:03 -0800 (Thu, 22 Nov 2007)
Log Message:
-----------
Fix button focusing / textalign
Modified Paths:
--------------
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectable.t
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/button.t
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectable.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectable.t
2007-11-22 04:08:39 UTC (rev 2609)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectable.t
2007-11-23 02:19:03 UTC (rev 2610)
@@ -61,13 +61,13 @@
var t = trapee;
var g = trapee.groupref;
// focusable property must be true
- return cascade and
+ return cascade and (!g or
// selectable clickable widget being clicked on
- ((t.primed or t.selected) or
+ (t.primed or t.selected) or
// navigated group with keys
- (g and (g.keygroup or
+ g.keygroup or
// no other group member is selected
- (!g.selected and (t == g.firstMember)))));
+ (!g.selected and (t == g.firstMember)));
}
/** group read trap */
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/button.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/button.t
2007-11-22 04:08:39 UTC (rev 2609)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/button.t
2007-11-23 02:19:03 UTC (rev 2610)
@@ -9,26 +9,27 @@
<selectable />
<ui:box>
- thisbox.selected ++= static.selectFunc;
- thisbox.textalign ++= static.textalignFunc;
- thisbox.th_content ++= static.contentFunc;
+ thisbox.textalign = "center";
+ thisbox.selected ++= static.selectWrite;
+ thisbox.textalign ++= static.textalignWrite;
+ thisbox.th_content ++= static.contentWrite;
+
</ui:box>
- static.contentFunc = function(v)
- {
+ /** set align to textalign on the content */
+ static.contentWrite = function(v) {
cascade = v;
v.align = trapee.textalign;
}
/** only activate selection if part of a button group */
- static.selectFunc = function(v)
- {
+ static.selectWrite = function(v) {
cascade = trapee.groupref ? v : false;
}
- static.textalignFunc = function(v)
- {
+ /** set align to textalign on the content */
+ static.textalignWrite = function(v) {
cascade = v;
trapee.th_content.align = v;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
