Update lot's of ui vocabularies for color objects

diff --git a/extra/ui/gadgets/buttons/buttons.factor b/extra/ui/gadgets/buttons/buttons.factor
index e9475495bf9069ca5d7d3ae112c8c7600b1223e3..c5a5e8bad8fa7a003e14cd7f36b51abe2cbbd06b 100755 (executable)
--- a/extra/ui/gadgets/buttons/buttons.factor
+++ b/extra/ui/gadgets/buttons/buttons.factor
@@ -106,7 +106,7 @@ TUPLE: checkmark-paint color ;
 C: <checkmark-paint> checkmark-paint
 
 M: checkmark-paint draw-interior
-    checkmark-paint-color gl-color
+    checkmark-paint-color set-color
     origin get [
         rect-dim
         { 0 0 } over gl-line
@@ -152,11 +152,11 @@ TUPLE: radio-paint color ;
 C: <radio-paint> radio-paint
 
 M: radio-paint draw-interior
-    radio-paint-color gl-color
+    radio-paint-color set-color
     origin get { 4 4 } v+ swap rect-dim { 8 8 } v- 12 gl-fill-circle ;
 
 M: radio-paint draw-boundary
-    radio-paint-color gl-color
+    radio-paint-color set-color
     origin get { 1 1 } v+ swap rect-dim { 2 2 } v- 12 gl-circle ;
 
 : radio-knob-theme ( gadget -- )

diff --git a/extra/ui/gadgets/editors/editors.factor b/extra/ui/gadgets/editors/editors.factor
index 8b0244900a9b7c450505fcdd483159c69a94fdc7..301121cdcc0f26716970e6c0e847676a3fa75087 100755 (executable)
--- a/extra/ui/gadgets/editors/editors.factor
+++ b/extra/ui/gadgets/editors/editors.factor
@@ -129,7 +129,7 @@ M: editor ungraft*
 : draw-caret ( -- )
     editor get editor-focused? [
         editor get
-        dup editor-caret-color gl-color
+        dup editor-caret-color set-color
         dup caret-loc origin get v+
         swap caret-dim over v+
         [ { 0.5 -0.5 } v+ ] bi@ gl-line
@@ -173,7 +173,7 @@ M: editor ungraft*
 
 : draw-lines ( -- )
     \ first-visible-line get [
-        editor get dup editor-color gl-color
+        editor get dup editor-color set-color
         dup visible-lines
         [ draw-line 1 translate-lines ] with each
     ] with-editor-translation ;
@@ -192,7 +192,7 @@ M: editor ungraft*
     (draw-selection) ;
 
 : draw-selection ( -- )
-    editor get editor-selection-color gl-color
+    editor get editor-selection-color set-color
     editor get selection-start/end
     over first [
         2dup [

diff --git a/extra/ui/gadgets/grid-lines/grid-lines.factor b/extra/ui/gadgets/grid-lines/grid-lines.factor
index d0cedc985b697b108ec468a9baaefbbc3cd06af1..3f08425e959a6b1d5482220f0f019c938e85d06a 100755 (executable)
--- a/extra/ui/gadgets/grid-lines/grid-lines.factor
+++ b/extra/ui/gadgets/grid-lines/grid-lines.factor
@@ -25,7 +25,7 @@ SYMBOL: grid-dim
 M: grid-lines draw-boundary
     origin get [
         -0.5 -0.5 0.0 glTranslated
-        grid-lines-color gl-color [
+        grid-lines-color set-color [
             dup grid set
             dup rect-dim half-gap v- grid-dim set
             compute-grid

diff --git a/extra/ui/gadgets/labelled/labelled.factor b/extra/ui/gadgets/labelled/labelled.factor
index bd775a2d391d0a28775c27d5cc6bf4bd13278ae7..dd5b1124e19f83ca8ac09f8601e633b4812a80c3 100755 (executable)
--- a/extra/ui/gadgets/labelled/labelled.factor
+++ b/extra/ui/gadgets/labelled/labelled.factor
@@ -31,8 +31,8 @@ M: labelled-gadget focusable-child* labelled-gadget-content ;
 : title-theme ( gadget -- )
     { 1 0 } over set-gadget-orientation
     T{ gradient f {
-        { 0.65 0.65 1.0 1.0 }
-        { 0.65 0.45 1.0 1.0 }
+        T{ rgba f 0.65 0.65 1.0 1.0 }
+        T{ rgba f 0.65 0.45 1.0 1.0 }
     } } swap set-gadget-interior ;
 
 : <title-label> ( text -- label ) <label> dup title-theme ;

diff --git a/extra/ui/gadgets/labels/labels.factor b/extra/ui/gadgets/labels/labels.factor
index a3a5c1a0a6cbfa5dc1abad52ef7f5c4c18d33000..24dbd04fdef62d265f9ab8eb6619577507e2153d 100755 (executable)
--- a/extra/ui/gadgets/labels/labels.factor
+++ b/extra/ui/gadgets/labels/labels.factor
@@ -35,7 +35,7 @@ M: label pref-dim*
     [ font>> open-font ] [ text>> ] bi text-dim ;
 
 M: label draw-gadget*
-    [ color>> gl-color ]
+    [ color>> set-color ]
     [ [ font>> ] [ text>> ] bi origin get draw-text ] bi ;
 
 M: label gadget-text* label-string % ;

diff --git a/extra/ui/gadgets/lists/lists.factor b/extra/ui/gadgets/lists/lists.factor
index c2539e146ab2054b3bde29fa31fe31203fd4be91..a4c313f9448e7b3a207c90d80f4aac470c07a6ad 100755 (executable)
--- a/extra/ui/gadgets/lists/lists.factor
+++ b/extra/ui/gadgets/lists/lists.factor
@@ -4,13 +4,14 @@ USING: accessors ui.commands ui.gestures ui.render ui.gadgets
 ui.gadgets.labels ui.gadgets.scrollers
 kernel sequences models opengl math math.order namespaces
 ui.gadgets.presentations ui.gadgets.viewports ui.gadgets.packs
-math.vectors classes.tuple math.geometry.rect ;
+math.vectors classes.tuple math.geometry.rect colors ;
+
 IN: ui.gadgets.lists
 
 TUPLE: list < pack index presenter color hook ;
 
 : list-theme ( list -- list )
-    { 0.8 0.8 1.0 1.0 } >>color ; inline
+    T{ rgba f 0.8 0.8 1.0 1.0 } >>color ; inline
 
 : <list> ( hook presenter model -- gadget )
     list new-gadget
@@ -56,7 +57,7 @@ M: list model-changed
 
 M: list draw-gadget*
     origin get [
-        dup list-color gl-color
+        dup list-color set-color
         selected-rect [ rect-extent gl-fill-rect ] when*
     ] with-translation ;
 

diff --git a/extra/ui/gadgets/panes/panes.factor b/extra/ui/gadgets/panes/panes.factor
index cca757e0eb708de096d22416c14938175f9e8ed3..e7798404f445666cc8c31813cca751673bca5481 100755 (executable)
--- a/extra/ui/gadgets/panes/panes.factor
+++ b/extra/ui/gadgets/panes/panes.factor
@@ -68,7 +68,7 @@ M: node draw-selection ( loc node -- )
 
 M: pane draw-gadget*
     dup gadget-selection? [
-        dup pane-selection-color gl-color
+        dup pane-selection-color set-color
         origin get over rect-loc v- swap selected-children
         [ draw-selection ] with each
     ] [

diff --git a/extra/ui/gadgets/theme/theme.factor b/extra/ui/gadgets/theme/theme.factor
index 68bd3b201ab5b75520eb9e1386855bad63677c70..20f560e309773e53656c69ee3ef396252bcd2be2 100644 (file)
--- a/extra/ui/gadgets/theme/theme.factor
+++ b/extra/ui/gadgets/theme/theme.factor
@@ -18,41 +18,41 @@ IN: ui.gadgets.theme
 
 : plain-gradient
     T{ gradient f {
-        { 0.94 0.94 0.94 1.0 }
-        { 0.83 0.83 0.83 1.0 }
-        { 0.83 0.83 0.83 1.0 }
-        { 0.62 0.62 0.62 1.0 }
+        T{ rgba f 0.94 0.94 0.94 1.0 }
+        T{ rgba f 0.83 0.83 0.83 1.0 }
+        T{ rgba f 0.83 0.83 0.83 1.0 }
+        T{ rgba f 0.62 0.62 0.62 1.0 }
     } } ;
 
 : rollover-gradient
     T{ gradient f {
-        { 1.0 1.0 1.0 1.0 }
-        { 0.9 0.9 0.9 1.0 }
-        { 0.9 0.9 0.9 1.0 }
-        { 0.75 0.75 0.75 1.0 }
+        T{ rgba f 1.0 1.0 1.0 1.0 }
+        T{ rgba f 0.9 0.9 0.9 1.0 }
+        T{ rgba f 0.9 0.9 0.9 1.0 }
+        T{ rgba f 0.75 0.75 0.75 1.0 }
     } } ;
 
 : pressed-gradient
     T{ gradient f {
-        { 0.75 0.75 0.75 1.0 }
-        { 0.9 0.9 0.9 1.0 }
-        { 0.9 0.9 0.9 1.0 }
-        { 1.0 1.0 1.0 1.0 }
+        T{ rgba f 0.75 0.75 0.75 1.0 }
+        T{ rgba f 0.9 0.9 0.9 1.0 }
+        T{ rgba f 0.9 0.9 0.9 1.0 }
+        T{ rgba f 1.0 1.0 1.0 1.0 }
     } } ;
 
 : selected-gradient
     T{ gradient f {
-        { 0.65 0.65 0.65 1.0 }
-        { 0.8 0.8 0.8 1.0 }
-        { 0.8 0.8 0.8 1.0 }
-        { 1.0 1.0 1.0 1.0 }
+        T{ rgba f 0.65 0.65 0.65 1.0 }
+        T{ rgba f 0.8 0.8 0.8 1.0 }
+        T{ rgba f 0.8 0.8 0.8 1.0 }
+        T{ rgba f 1.0 1.0 1.0 1.0 }
     } } ;
 
 : lowered-gradient
     T{ gradient f {
-        { 0.37 0.37 0.37 1.0 }
-        { 0.43 0.43 0.43 1.0 }
-        { 0.5 0.5 0.5 1.0 }
+        T{ rgba f 0.37 0.37 0.37 1.0 }
+        T{ rgba f 0.43 0.43 0.43 1.0 }
+        T{ rgba f 0.5 0.5 0.5 1.0 }
     } } ;
 
 : sans-serif-font { "sans-serif" plain 12 } ;

diff --git a/extra/ui/render/render.factor b/extra/ui/render/render.factor
index 6e9a4778a7fe7f9b8d36dbc9371676be7415fb3a..a0a51b09dae0ad95bd3074df528063ccdad4ec9d 100644 (file)
--- a/extra/ui/render/render.factor
+++ b/extra/ui/render/render.factor
@@ -35,7 +35,7 @@ SYMBOL: viewport-translation
     init-clip
     ! white gl-clear is broken w.r.t window resizing
     ! Linux/PPC Radeon 9200
-    white gl-color
+    white set-color
     clip get rect-extent gl-fill-rect ;
 
 GENERIC: draw-gadget* ( gadget -- )
@@ -95,7 +95,7 @@ C: <solid> solid
 
 ! Solid pen
 : (solid) ( gadget paint -- loc dim )
-    solid-color gl-color rect-dim >r origin get dup r> v+ ;
+    solid-color set-color rect-dim >r origin get dup r> v+ ;
 
 M: solid draw-interior (solid) gl-fill-rect ;
 
@@ -121,7 +121,7 @@ C: <polygon> polygon
 
 : draw-polygon ( polygon quot -- )
     origin get [
-        >r dup polygon-color gl-color polygon-points r> call
+        >r dup polygon-color set-color polygon-points r> call
     ] with-translation ; inline
 
 M: polygon draw-boundary