REF use better color functions

core

@@ -1 +1 @@
-Subproject commit 6243b9ca1540115cc66327286ab1e711a793e5c3
+Subproject commit e263ef81ea6310356119f43b8c3b03577f36a2d2

schema/Patterns.lua

@@ -5,49 +5,49 @@ local Util 	= require 'Util'
 
 M.FONT = 'Neuropolitical'
 -- text colors
-M.HEADER_FG = Color.init{hex_rgba = 0xffffff}
+M.HEADER_FG = Color.rgb(0xffffff)
 
-M.INACTIVE_TEXT_FG = Color.init{hex_rgba = 0xeeeeee}
+M.INACTIVE_TEXT_FG = Color.rgb(0xeeeeee)
 -- TODO this is also the plot label color
-M.MID_GREY = Color.init{hex_rgba = 0xd6d6d6}
+M.MID_GREY = Color.rgb(0xd6d6d6)
-M.BORDER_FG = Color.init{hex_rgba = 0x888888}
+M.BORDER_FG = Color.rgb(0x888888)
 
-M.PRIMARY_FG = Color.init{hex_rgba = 0xbfe1ff}
+M.PRIMARY_FG = Color.rgb(0xbfe1ff)
-M.SECONDARY_FG = Color.init{hex_rgba = 0xcb91ff}
+M.SECONDARY_FG = Color.rgb(0xcb91ff)
-M.TERTIARY_FG = Color.init{hex_rgba = 0xefe7aa}
+M.TERTIARY_FG = Color.rgb(0xefe7aa)
-M.CRITICAL_FG = Color.init{hex_rgba = 0xff8282}
+M.CRITICAL_FG = Color.rgb(0xff8282)
 
 -- arc patterns
 local GREY2 = 0xbfbfbf
 local GREY5 = 0x565656
-M.INDICATOR_BG = Color.Gradient{
+M.INDICATOR_BG = Color.gradient{
-	Color.ColorStop{hex_rgba = GREY5, stop = 0.0},
+	Color.colorstop_rgb(GREY5, 0.0),
-	Color.ColorStop{hex_rgba = GREY2, stop = 0.5},
+	Color.colorstop_rgb(GREY2, 0.5),
-	Color.ColorStop{hex_rgba = GREY5, stop = 1.0}
+	Color.colorstop_rgb(GREY5, 1.0)
 }
 
 local BLUE1 = 0x99CEFF
 local BLUE3 = 0x316BA6
-M.INDICATOR_FG_PRIMARY = Color.Gradient{
+M.INDICATOR_FG_PRIMARY = Color.gradient{
-	Color.ColorStop{hex_rgba = BLUE3, stop = 0.0},
+	Color.colorstop_rgb(BLUE3, 0.0),
-	Color.ColorStop{hex_rgba = BLUE1, stop = 0.5},
+	Color.colorstop_rgb(BLUE1, 0.5),
-	Color.ColorStop{hex_rgba = BLUE3, stop = 1.0}
+	Color.colorstop_rgb(BLUE3, 1.0)
 }
 
 local PURPLE1 = 0xeecfff
 local PURPLE3 = 0x9523ff
-M.INDICATOR_FG_SECONDARY = Color.Gradient{
+M.INDICATOR_FG_SECONDARY = Color.gradient{
-	Color.ColorStop{hex_rgba = PURPLE3, stop = 0.0},
+	Color.colorstop_rgb(PURPLE3, 0.0),
-	Color.ColorStop{hex_rgba = PURPLE1, stop = 0.5},
+	Color.colorstop_rgb(PURPLE1, 0.5),
-	Color.ColorStop{hex_rgba = PURPLE3, stop = 1.0}
+	Color.colorstop_rgb(PURPLE3, 1.0)
 }
 
 local RED1 = 0xFF3333
 local RED3 = 0xFFB8B8
-M.INDICATOR_FG_CRITICAL = Color.Gradient{
+M.INDICATOR_FG_CRITICAL = Color.gradient{
-	Color.ColorStop{hex_rgba = RED1, stop = 0.0},
+	Color.colorstop_rgb(RED1, 0.0),
-	Color.ColorStop{hex_rgba = RED3, stop = 0.5},
+	Color.colorstop_rgb(RED3, 0.5),
-	Color.ColorStop{hex_rgba = RED1, stop = 1.0}
+	Color.colorstop_rgb(RED1, 1.0)
 }
 
 -- plot patterns
@@ -55,47 +55,45 @@ local PLOT_BLUE1 = 0x003f7c
 local PLOT_BLUE2 = 0x1e90ff
 local PLOT_BLUE3 = 0x316ece
 local PLOT_BLUE4 = 0x8cc7ff
-M.PLOT_FILL_BORDER_PRIMARY = Color.Gradient{
+M.PLOT_FILL_BORDER_PRIMARY = Color.gradient{
-	Color.ColorStop{hex_rgba = PLOT_BLUE1, stop = 0.0},
+	Color.colorstop_rgb(PLOT_BLUE1, 0.0),
-	Color.ColorStop{hex_rgba = PLOT_BLUE2, stop = 1.0}
+	Color.colorstop_rgb(PLOT_BLUE2, 1.0)
 }
 
-M.PLOT_FILL_BG_PRIMARY = Color.Gradient{
+M.PLOT_FILL_BG_PRIMARY = Color.gradient{
-	Color.ColorStop{hex_rgba = PLOT_BLUE3, stop = 0.0, alpha = 0.2},
+	Color.colorstop_rgba(PLOT_BLUE3, 0.2, 0.0),
-	Color.ColorStop{hex_rgba = PLOT_BLUE4, stop = 1.0, alpha = 1.0}
+	Color.colorstop_rgba(PLOT_BLUE4, 1.0, 1.0)
 }
 
 local PLOT_PURPLE1 = 0x3e0077
 local PLOT_PURPLE2 = 0x9523ff
 local PLOT_PURPLE3 = 0x7a30a3
 local PLOT_PURPLE4 = 0xeac4ff
-M.PLOT_FILL_BORDER_SECONDARY = Color.Gradient{
+M.PLOT_FILL_BORDER_SECONDARY = Color.gradient{
-	Color.ColorStop{hex_rgba = PLOT_PURPLE1, stop = 0.0},
+	Color.colorstop_rgb(PLOT_PURPLE1, 0.0),
-	Color.ColorStop{hex_rgba = PLOT_PURPLE2, stop = 1.0}
+	Color.colorstop_rgb(PLOT_PURPLE2, 1.0)
 }
 
-M.PLOT_FILL_BG_SECONDARY = Color.Gradient{
+M.PLOT_FILL_BG_SECONDARY = Color.gradient{
-	Color.ColorStop{hex_rgba = PLOT_PURPLE3, stop = 0.0, alpha = 0.2},
+	Color.colorstop_rgba(PLOT_PURPLE3, 0.2, 0.0),
-	Color.ColorStop{hex_rgba = PLOT_PURPLE4, stop = 1.0, alpha = 1.0}
+	Color.colorstop_rgba(PLOT_PURPLE4, 1.0, 1.0)
 }
 
 local PLOT_YELLOW1 = 0x231f00
 local PLOT_YELLOW2 = 0x7c6f00
 local PLOT_YELLOW3 = 0x8c8225
 local PLOT_YELLOW4 = 0xfff387
-M.PLOT_FILL_BORDER_TERTIARY = Color.Gradient{
+M.PLOT_FILL_BORDER_TERTIARY = Color.gradient{
-	Color.ColorStop{hex_rgba = PLOT_YELLOW1, stop = 0.0},
+	Color.colorstop_rgb(PLOT_YELLOW1, 0.0),
-	Color.ColorStop{hex_rgba = PLOT_YELLOW2, stop = 1.0}
+	Color.colorstop_rgb(PLOT_YELLOW2, 1.0)
 }
 
-M.PLOT_FILL_BG_TERTIARY = Color.Gradient{
+M.PLOT_FILL_BG_TERTIARY = Color.gradient{
-	Color.ColorStop{hex_rgba = PLOT_YELLOW3, stop = 0.0, alpha = 0.2},
+	Color.colorstop_rgba(PLOT_YELLOW3, 0.2, 0.0),
-	Color.ColorStop{hex_rgba = PLOT_YELLOW4, stop = 1.0, alpha = 1.0}
+	Color.colorstop_rgba(PLOT_YELLOW4, 1.0, 1.0)
 }
 
 -- panel pattern
-M.PANEL_BG = Color.init{hex_rgba = 0x000000, alpha = 0.7}
+M.PANEL_BG = Color.rgba(0x000000, 0.7)
 
-M = Util.set_finalizer(M, function() print('Cleaning up Patterns.lua') end)
+return Util.set_finalizer(M, function() print('Cleaning up Patterns.lua') end)
-
-return M