nicer theme

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 335038eabbd0bcda83c2c99235f1a72b57f6b0a4..2e0b2d573dee27c6fea1fc197c710af2897f1966 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -10,6 +10,7 @@
 - deallocate textures and display lists\r
 - nicer-looking buttons\r
 - pixelColor replacement\r
+- fix presentations\r
 \r
 + ui:\r
 \r

diff --git a/library/help/tutorial.factor b/library/help/tutorial.factor
index bd5ce08287c0f9c89400d963851b7f47fce0a647..1ab8b6aeb74717fad10fe1e530f1380334656377 100644 (file)
--- a/library/help/tutorial.factor
+++ b/library/help/tutorial.factor
@@ -4,8 +4,12 @@ gadgets-editors gadgets-labels gadgets-layouts gadgets-panes
 gadgets-presentations gadgets-theme generic kernel lists math\r
 namespaces sdl sequences strings styles ;\r
 \r
+: tutorial-font @{ "Serif" plain 14 }@ swap set-label-font ;\r
+\r
+: heading-font @{ "Serif" plain 24 }@ swap set-label-font ;\r
+\r
 : <slide-title> ( text -- gadget )\r
-    <label> dup 24 font-size set-paint-prop ;\r
+    <label> dup heading-font ;\r
 \r
 : <underline> ( -- gadget )\r
     <gadget>\r
@@ -20,21 +24,18 @@ M: string tutorial-line
     @{\r
         @{ [ "* " ?head ] [ <slide-title> ] }@\r
         @{ [ dup "--" = ] [ drop <underline> ] }@\r
-        @{ [ t ] [ <label> ] }@\r
+        @{ [ t ] [ <label> dup tutorial-font ] }@\r
     }@ cond ;\r
 \r
 : example-theme\r
-    dup solid-interior "Monospaced" font set-paint-prop ;\r
+    << solid f @{ 204 204 255 }@ >> swap set-gadget-interior ;\r
 \r
 M: general-list tutorial-line\r
     car <input-button> dup example-theme ;\r
 \r
 : page-theme\r
-    dup @{ 204 204 255 }@ background set-paint-prop\r
     << gradient f @{ @{ 204 204 255 }@ @{ 255 204 255 }@ }@ >>\r
-    over set-gadget-interior\r
-    dup "Sans Serif" font set-paint-prop\r
-    16 font-size set-paint-prop ;\r
+    swap set-gadget-interior ;\r
 \r
 : <page> ( list -- gadget )\r
     [ tutorial-line ] map make-pile 1 over set-pack-fill\r

diff --git a/library/ui/theme.factor b/library/ui/theme.factor
index 2ab3df1abe83eedbd3b41f917869d7622d1c6516..a51cb1decad047ad158701e3d571d8091f9c56f8 100644 (file)
--- a/library/ui/theme.factor
+++ b/library/ui/theme.factor
@@ -21,33 +21,37 @@ USING: arrays gadgets kernel sequences styles ;
 : plain-gradient
     << gradient f @{
         @{ 240 240 240 }@
-        @{ 192 192 192 }@
-        @{ 192 192 192 }@
-        @{ 96 96 96 }@
+        @{ 212 212 212 }@
+        @{ 212 212 212 }@
+        @{ 160 160 160 }@
     }@ >> ;
 
 : rollover-gradient
     << gradient f @{
         @{ 255 255 255 }@
-        @{ 216 216 216 }@
-        @{ 216 216 216 }@
-        @{ 112 112 112 }@
+        @{ 232 232 232 }@
+        @{ 232 232 232 }@
+        @{ 192 192 192 }@
     }@ >> ;
 
 : pressed-gradient
     << gradient f @{
-        @{ 112 112 112 }@
-        @{ 216 216 216 }@
-        @{ 216 216 216 }@
+        @{ 192 192 192 }@
+        @{ 232 232 232 }@
+        @{ 232 232 232 }@
         @{ 255 255 255 }@
     }@ >> ;
 
+: faint-boundary
+    << solid f @{ 160 160 160 }@ >> swap set-gadget-boundary ;
+
 : bevel-button-theme ( gadget -- )
     plain-gradient rollover-gradient pressed-gradient
-    <button-paint> swap set-gadget-interior ;
+    <button-paint> over set-gadget-interior
+    faint-boundary ;
 
 : thumb-theme ( thumb -- )
-    plain-gradient swap set-gadget-interior ;
+    plain-gradient over set-gadget-interior faint-boundary ;
 
 : roll-button-theme ( button -- )
     f solid-black solid-black <button-paint> over set-gadget-boundary
@@ -58,8 +62,8 @@ USING: arrays gadgets kernel sequences styles ;
 
 : elevator-theme ( elevator -- )
     << gradient f @{
-        @{ 64 64 64 }@
         @{ 96 96 96 }@
+        @{ 112 112 112 }@
         @{ 128 128 128 }@
     }@ >> swap set-gadget-interior ;
 

diff --git a/library/ui/world.factor b/library/ui/world.factor
index 356a1ccad7d365c61514a7f2cb4660dad96acdb7..ed161a9c42acaa5411f1843ae2a537afecd59fee 100644 (file)
--- a/library/ui/world.factor
+++ b/library/ui/world.factor
@@ -99,7 +99,7 @@ M: motion-event handle-event ( event -- )
 
 : world-step ( -- )
     world get world-invalid >r layout-world r>
-    [ update-hand [ draw-world ] USE: test time ] when ;
+    [ update-hand draw-world ] when ;
 
 : next-event ( -- event ? ) <event> dup SDL_PollEvent ;