UI: Default theme update for contrast

Selected color is now .9 alpha so keyed/animated/driven statuses
show through when widget is active. Assign color for overriden state.

Also fix progress bar not visible.

1 files changed, 48 insertions, 46 deletions

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index aea7e40573a..4c117dca354 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -20,9 +20,9 @@ const bTheme U_theme_default = {
 	.name = "Default",
 	.tui = {
 		.wcol_regular = {
-			.outline = RGBA(0x3e3e3eff),
+			.outline = RGBA(0x444444ff),
 			.inner = RGBA(0x585858ff),
-			.inner_sel = RGBA(0x5680c2ff),
+			.inner_sel = RGBA(0x5680c2e6),
 			.item = RGBA(0x3e3e3eff),
 			.text = RGBA(0xebebebff),
 			.text_sel = RGBA(0xffffffff),
@@ -30,7 +30,7 @@ const bTheme U_theme_default = {
 			.roundness = 0.2f,
 		},
 		.wcol_tool = {
-			.outline = RGBA(0x343434ff),
+			.outline = RGBA(0x444444ff),
 			.inner = RGBA(0x585858ff),
 			.inner_sel = RGBA(0x5680c2ff),
 			.item = RGBA(0xffffffff),
@@ -40,29 +40,29 @@ const bTheme U_theme_default = {
 			.roundness = 0.2f,
 		},
 		.wcol_toolbar_item = {
-			.outline = RGBA(0x191919ff),
+			.outline = RGBA(0x444444ff),
 			.inner = RGBA(0x585858ff),
-			.inner_sel = RGBA(0x333333ff),
+			.inner_sel = RGBA(0x5680c2ff),
 			.item = RGBA(0xffffff8f),
 			.text = RGBA(0xffffffff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.25f,
 		},
 		.wcol_text = {
-			.outline = RGBA(0x4d4d4dff),
-			.inner = RGBA(0x333333ff),
+			.outline = RGBA(0x444444ff),
+			.inner = RGBA(0x2c2c2cff),
 			.inner_sel = RGBA(0x808080ff),
 			.item = RGBA(0x333333ff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
 			.shaded = 1,
 			.shadetop = -3,
-			.roundness = 0.2f,
+			.roundness = 0.1f,
 		},
 		.wcol_radio = {
-			.outline = RGBA(0x525252ff),
-			.inner = RGBA(0x585858ff),
-			.inner_sel = RGBA(0x5680c2ff),
+			.outline = RGBA(0x444444ff),
+			.inner = RGBA(0x595959ff),
+			.inner_sel = RGBA(0x5680c2e6),
 			.item = RGBA(0xffffffff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
@@ -71,9 +71,9 @@ const bTheme U_theme_default = {
 			.roundness = 0.2f,
 		},
 		.wcol_option = {
-			.outline = RGBA(0x525252ff),
-			.inner = RGBA(0x666666cc),
-			.inner_sel = RGBA(0x5680c2ff),
+			.outline = RGBA(0x444444ff),
+			.inner = RGBA(0x666666ff),
+			.inner_sel = RGBA(0x5680c2e6),
 			.item = RGBA(0xffffffff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
@@ -82,17 +82,17 @@ const bTheme U_theme_default = {
 		},
 		.wcol_toggle = {
 			.outline = RGBA(0x4d4d4dff),
-			.inner = RGBA(0x666666ff),
-			.inner_sel = RGBA(0x5680c2ff),
+			.inner = RGBA(0x595959ff),
+			.inner_sel = RGBA(0x5680c2e6),
 			.item = RGBA(0x191919ff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.25f,
 		},
 		.wcol_num = {
-			.outline = RGBA(0x4d4d4dff),
-			.inner = RGBA(0x585858ff),
-			.inner_sel = RGBA(0x808080ff),
+			.outline = RGBA(0x444444ff),
+			.inner = RGBA(0x595959ff),
+			.inner_sel = RGBA(0xb3b3b366),
 			.item = RGBA(0x333333ff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
@@ -100,8 +100,8 @@ const bTheme U_theme_default = {
 			.roundness = 0.3f,
 		},
 		.wcol_numslider = {
-			.outline = RGBA(0x4d4d4dff),
-			.inner = RGBA(0x474747ff),
+			.outline = RGBA(0x444444ff),
+			.inner = RGBA(0x3b3b3bff),
 			.inner_sel = RGBA(0x808080ff),
 			.item = RGBA(0x585858ff),
 			.text = RGBA(0xeeeeeeff),
@@ -115,12 +115,12 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x323232ff),
 			.inner_sel = RGBA(0x4b4b4bff),
 			.item = RGBA(0x2d2d2dff),
-			.text = RGBA(0xbebebeff),
+			.text = RGBA(0xa4a4a4ff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.15f,
 		},
 		.wcol_menu = {
-			.outline = RGBA(0x4d4d4dff),
+			.outline = RGBA(0x444444ff),
 			.inner = RGBA(0x2e2e2eff),
 			.inner_sel = RGBA(0x585858ff),
 			.item = RGBA(0xe6e6e6ff),
@@ -142,7 +142,7 @@ const bTheme U_theme_default = {
 			.roundness = 0.2f,
 		},
 		.wcol_menu_back = {
-			.outline = RGBA(0x2e2e2eff),
+			.outline = RGBA(0x19191aff),
 			.inner = RGBA(0x1f1f1fef),
 			.inner_sel = RGBA(0x585858ff),
 			.item = RGBA(0x727272ff),
@@ -161,7 +161,7 @@ const bTheme U_theme_default = {
 			.roundness = 0.25f,
 		},
 		.wcol_tooltip = {
-			.outline = RGBA(0x353535ff),
+			.outline = RGBA(0x19191aff),
 			.inner = RGBA(0x19191aef),
 			.inner_sel = RGBA(0x19191aef),
 			.item = RGBA(0x19191aef),
@@ -169,11 +169,11 @@ const bTheme U_theme_default = {
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 25,
 			.shadedown = -20,
-			.roundness = 0.25f,
+			.roundness = 0.4f,
 		},
 		.wcol_box = {
 			.outline = RGBA(0x333333ff),
-			.inner = RGBA(0x4d4d4dff),
+			.inner = RGBA(0x4d4d4dcc),
 			.inner_sel = RGBA(0x808080ff),
 			.item = RGBA(0x191919ff),
 			.text = RGBA(0xeeeeeeff),
@@ -181,7 +181,7 @@ const bTheme U_theme_default = {
 			.roundness = 0.2f,
 		},
 		.wcol_scroll = {
-			.outline = RGBA(0x353535ff),
+			.outline = RGBA(0x424242ff),
 			.inner = RGBA(0x67676700),
 			.inner_sel = RGBA(0xb3b3b3ff),
 			.item = RGBA(0x676767ff),
@@ -192,10 +192,10 @@ const bTheme U_theme_default = {
 			.roundness = 0.5f,
 		},
 		.wcol_progress = {
-			.outline = RGBA(0xb3b3b3ff),
-			.inner = RGBA(0xccccccff),
-			.inner_sel = RGBA(0x646464b4),
-			.item = RGBA(0xb3b3b3ff),
+			.outline = RGBA(0x585858ff),
+			.inner = RGBA(0x2c2c2cff),
+			.inner_sel = RGBA(0x5680c2ff),
+			.item = RGBA(0x5680c2ff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.25f,
@@ -211,7 +211,7 @@ const bTheme U_theme_default = {
 		},
 		.wcol_pie_menu = {
 			.outline = RGBA(0x2e2e2eff),
-			.inner = RGBA(0x2e2e2eff),
+			.inner = RGBA(0x212121ff),
 			.inner_sel = RGBA(0x585858ff),
 			.item = RGBA(0x5680c2ff),
 			.text = RGBA(0xeeeeeeff),
@@ -227,14 +227,16 @@ const bTheme U_theme_default = {
 			.inner_key_sel = RGBA(0xd7d34bff),
 			.inner_driven = RGBA(0xb400ffff),
 			.inner_driven_sel = RGBA(0x9900e6ff),
+			.inner_overridden = RGBA(0x19c3c300),
+			.inner_overridden_sel = RGBA(0x118f8f00),
 			.blend = 0.5f,
 		},
 		.widget_emboss = RGBA(0x00000005),
 		.menu_shadow_fac = 0.3f,
 		.menu_shadow_width = 4,
-		.editor_outline = RGBA(0x202020ff),
+		.editor_outline = RGBA(0x1f1f1fff),
 		.icon_alpha = 1.0f,
-		.icon_saturation = 0.4f,
+		.icon_saturation = 0.5f,
 		.xaxis = RGBA(0xff3352ff),
 		.yaxis = RGBA(0x8bdc00ff),
 		.zaxis = RGBA(0x2890ffff),
@@ -246,8 +248,8 @@ const bTheme U_theme_default = {
 	},
 	.tbuts = {
 		.back = RGBA(0x42424200),
-		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.title = RGBA(0xd4d4d4ff),
+		.text = RGBA(0xe5e5e5ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -261,7 +263,7 @@ const bTheme U_theme_default = {
 		.button_text = RGBA(0xffffffff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
-			.header = RGBA(0x424242cc),
+			.header = RGBA(0x42424200),
 			.back = RGBA(0x333333b3),
 			.sub_back = RGBA(0x0000003e),
 			.show_header = 1,
@@ -508,7 +510,7 @@ const bTheme U_theme_default = {
 		.shade1 = RGBA(0xc0c0c000),
 		.shade2 = RGBA(0x70707064),
 		.hilite = RGBA(0x60c040ff),
-		.grid = RGBA(0x1a1a1aff),
+		.grid = RGBA(0x272727ff),
 		.group = RGBA(0x278c0eff),
 		.group_active = RGBA(0x4eb335ff),
 		.strip = RGBA(0x1a151580),
@@ -687,7 +689,7 @@ const bTheme U_theme_default = {
 		.title = RGBA(0xeeeeeeff),
 		.text = RGBA(0xffffffff),
 		.text_hi = RGBA(0xffffffff),
-		.header = RGBA(0x424242ff),
+		.header = RGBA(0x42424200),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
 		.tab_active = RGBA(0x4b4b4bff),
@@ -699,7 +701,7 @@ const bTheme U_theme_default = {
 		.button_text = RGBA(0xffffffff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
-			.header = RGBA(0x424242cc),
+			.header = RGBA(0x42424200),
 			.back = RGBA(0x333333b3),
 			.sub_back = RGBA(0x0000003e),
 			.show_header = 1,
@@ -721,9 +723,9 @@ const bTheme U_theme_default = {
 		.syntaxr = RGBA(0xc4753bff),
 	},
 	.toops = {
-		.back = RGBA(0x42424200),
+		.back = RGBA(0x35353500),
 		.title = RGBA(0xffffffff),
-		.text = RGBA(0xdededeff),
+		.text = RGBA(0xc3c3c3ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x454545ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -747,7 +749,7 @@ const bTheme U_theme_default = {
 		.outline_width = 1,
 		.facedot_size = 4,
 		.match = RGBA(0x337f334c),
-		.selected_highlight = RGBA(0x747a834c),
+		.selected_highlight = RGBA(0x696e764c),
 	},
 	.ttime = {
 		.vertex_size = 3,
@@ -827,7 +829,7 @@ const bTheme U_theme_default = {
 		.button_text = RGBA(0xffffffff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
-			.header = RGBA(0x424242cc),
+			.header = RGBA(0x42424200),
 			.back = RGBA(0x333333b3),
 			.sub_back = RGBA(0x0000003e),
 			.show_header = 1,
@@ -949,7 +951,7 @@ const bTheme U_theme_default = {
 		.title = RGBA(0xffffffff),
 		.text = RGBA(0x838383ff),
 		.text_hi = RGBA(0xffffffff),
-		.header = RGBA(0x232323ff),
+		.header = RGBA(0x303030ff),
 		.header_text = RGBA(0xaaaaaaff),
 		.header_text_hi = RGBA(0xffffffff),
 		.tab_active = RGBA(0x4b4b4bff),