2003/10/28 10:10:18

[org.ibex.core.git] / src / org / xwt / builtin / splash.xwt

diff --git a/src/org/xwt/builtin/splash.xwt b/src/org/xwt/builtin/splash.xwt
index 9d6ef80..2682d44 100644 (file)
--- a/src/org/xwt/builtin/splash.xwt
+++ b/src/org/xwt/builtin/splash.xwt
@@ -1,18 +1,17 @@
 <xwt>
 
-    <template thisbox="window" orient="vertical" width="394" height="276">
+    <template orient="vertical" width="394" height="276" color="white">
 
         KeyPressed += function(k) { if (k == "escape") thisbox = null; }
 
         var progress = function(n, d) {
-            $innerbar.width = $bar.width * n / d;
+            $innerbar.width = $bar.width * n / d + 1;
+            $text.text = "downloaded " + (xwt.math.ceil(100 * n/d)) + "%";
             xwt.yield();
         }
 
         xwt.thread = function() {
-            var img = xwt.org.xwt.builtin["splash.png"];
-            fill = img;
-            xwt.yield();
+            xwt.window = thisbox;
             x = (xwt.screenWidth - width) / 2;
             y = (xwt.screenHeight - height) / 2;
             var origin = xwt.origin;
@@ -23,10 +22,23 @@
             xwt.println("origin is " + origin);
             var new_rr = xwt.unzip(xwt.watchProgress(xwt.load(origin), progress));
             var new_xwt = xwt.clone(new_rr);
+            $text.font = xwt.fonts.vera["Vera.ttf"];
+$text.textcolor = "#f11ff1";
+            $text.fontsize = 80;
+            $text.text = "downloading...";
+Press1 += function() { xwt.thread = function() {
+            var img = xwt.org.xwt.builtin["splash.png"];
+            fill = img;
+            xwt.yield();
             new_xwt.apply(xwt.box, new_xwt["main.xwt"]);
+            thisbox = null;
+} }
         }
 
-        <box packed="false" id="bar" x="20" y="236" width="354" height="18" align="left">
+        <box height="236" align="bottomleft" packed="false" x="20" y="0">
+            <box fontcolor="white" id="text" shrink="true"/>
+        </box>
+        <box packed="false" id="bar" x="20" y="236" width="354" height="20" align="left">
             <box id="innerbar" fill="blue" width="10"/>
         </box>