Revision: 1955
          http://svn.sourceforge.net/vexi/?rev=1955&view=rev
Author:   clrg
Date:     2007-07-08 17:36:10 -0700 (Sun, 08 Jul 2007)

Log Message:
-----------
More text related tweaks
- label no longer displays a cursor when click on
- now label inherits lib.text.edit instead of lib.text.default
- other tweaks to take into account above changes

Modified Paths:
--------------
    widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/default.t
    widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/edit.t
    widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/label.t
    widgets/trunk/org.vexi.widgets/src/vexi/widget/label.t

Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/default.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/default.t      
2007-07-08 23:15:15 UTC (rev 1954)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/default.t      
2007-07-09 00:36:10 UTC (rev 1955)
@@ -7,7 +7,7 @@
     </meta:doc>
     
     <ui:box layout="absolute">
-        <text.edit id="edit" highlightcolor="white" highlightfill="darkblue" />
+        <text.edit id="edit" />
         <role.repeatable id="cursor" display="false" fill="black" 
interval="300" width="1">
             
             var counter = 0;        // counter used to implement blinking

Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/edit.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/edit.t 2007-07-08 
23:15:15 UTC (rev 1954)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/edit.t 2007-07-09 
00:36:10 UTC (rev 1955)
@@ -86,7 +86,7 @@
         </details>
     </meta:doc>
         
-    <ui:box orient="vertical" vshrink="true">
+    <ui:box highlightcolor="white" highlightfill="darkblue" orient="vertical" 
vshrink="true">
 
         // use vars for encapsulation and efficiency
         
@@ -1610,6 +1610,13 @@
             select = true;
         }
         
+        var releaseFunc = function(v)
+        {
+            cascade = v;
+            surface.delMoveTrap(moveFunc);
+            surface._Release1 --= callee;
+        }
+        
         /** standard mouse interaction */
         thisbox.Press1 ++= function(v)
         {
@@ -1639,11 +1646,7 @@
             
             // instigate mouse-reaction behaviour
             surface.addMoveTrap(moveFunc);
-            surface.Release1 ++= function(v)
-            {
-                surface.delMoveTrap(moveFunc);
-                surface.Release1 --= callee;
-            }
+            surface._Release1 ++= releaseFunc;
         }
         
         /** selects all available words */

Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/label.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/label.t     
2007-07-08 23:15:15 UTC (rev 1954)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/label.t     
2007-07-09 00:36:10 UTC (rev 1955)
@@ -5,12 +5,5 @@
         <author>Charles Goodwin</author>
     </meta:doc>
     
-    <default enabled="false" multiline="true">
-        
-        th_edit.syncCursor = static.syncCursor;
-        
-    </default>
-    
-    static.syncCursor = function() { return true; }
-    
+    <edit enabled="false" multiline="true" />
 </vexi>

Modified: widgets/trunk/org.vexi.widgets/src/vexi/widget/label.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/vexi/widget/label.t      2007-07-08 
23:15:15 UTC (rev 1954)
+++ widgets/trunk/org.vexi.widgets/src/vexi/widget/label.t      2007-07-09 
00:36:10 UTC (rev 1955)
@@ -12,7 +12,7 @@
             </pad>
         </pad>
         
-        rdrt..addRedirect(thisbox, $widget.th_edit, "font", "fontsize", 
"text", "textcolor", "enabled", "focused", "KeyPressed");
+        rdrt..addRedirect(thisbox, $widget, "font", "fontsize", "text", 
"textcolor", "focused", "KeyPressed");
         rdrt..addRedirect(thisbox, $margin, "margin", "marginleft", 
"marginright", "margintop", "marginbottom");
         rdrt..addRedirect(thisbox, $pad, "fill", "padding", "paddingleft", 
"paddingright", "paddingtop", "paddingbottom");
         


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 DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn

Reply via email to