ui fixes

diff --git a/library/ui/sliders.factor b/library/ui/sliders.factor
index ccb5d61329b287a905504f43430e605e41301f39..5bda48bd3d74d4850bb1ffe5cee446d5bc8f0273 100644 (file)
--- a/library/ui/sliders.factor
+++ b/library/ui/sliders.factor
@@ -135,10 +135,10 @@ C: slider ( vector -- slider )
     0 over set-slider-page
     0 over set-slider-max
     dup slider-opposite
-    2dup <elevator> pick add-elevator
+    dup <elevator> pick add-elevator
     2dup <up-button> pick add-up
     2dup <down-button> pick add-down
-    dupd <thumb> pick add-thumb ;
+    <thumb> over add-thumb ;
 
 : <x-slider> ( -- slider ) @{ 1 0 0 }@ <slider> ;
 

diff --git a/library/ui/theme.factor b/library/ui/theme.factor
index 4177453d9f904828d1eed76a6eb16e219eda56e6..28fbe104829e9ecb0b6a7dbbdee53269a0510222 100644 (file)
--- a/library/ui/theme.factor
+++ b/library/ui/theme.factor
@@ -10,14 +10,12 @@ USING: arrays gadgets kernel sequences styles ;
     << solid >> boundary set-paint-prop ;
 
 : button-theme ( gadget -- )
-    dup << gradient @{
+    << gradient f @{
         @{ 240 240 240 }@
         @{ 192 192 192 }@
         @{ 192 192 192 }@
         @{ 96 96 96 }@
-    }@ >> interior set-paint-prop
-    dup @{ 96 96 96 }@ foreground set-paint-prop
-    << solid >> boundary set-paint-prop ;
+    }@ >> interior set-paint-prop ;
 
 : editor-theme ( editor -- )
     bold font-style set-paint-prop ;
@@ -31,7 +29,7 @@ USING: arrays gadgets kernel sequences styles ;
     red background set-paint-prop ;
 
 : elevator-theme ( elevator -- )
-    dup << gradient @{
+    dup << gradient f @{
         @{ 64 64 64 }@
         @{ 96 96 96 }@
         @{ 128 128 128 }@