[Bf-blender-cvs] [a6fe4d112ff] master: Fix: widget states had too low contrast

[William Reynish]

Commit: a6fe4d112ff48481a596cf8f8e95dad45416df8a
Author: William Reynish
Date:   Mon Jul 1 16:26:06 2019 +0200
Branches: master
https://developer.blender.org/rBa6fe4d112ff48481a596cf8f8e95dad45416df8a

Fix: widget states had too low contrast

It was very hard to read the sliders when they had states such as animated or changed.
Slightly increase contrast to alleviate this.

===================================================================

M	release/datafiles/userdef/userdef_default_theme.c
M	source/blender/editors/interface/interface_widgets.c

===================================================================

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 95d27e41440..3dc0367b2f4 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -225,14 +225,14 @@ const bTheme U_theme_default = {
       .inner_anim = RGBA(0x53992eff),
       .inner_anim_sel = RGBA(0x5aa633ff),
       .inner_key = RGBA(0xb3ae36ff),
-      .inner_key_sel = RGBA(0xd7d34bff),
+      .inner_key_sel = RGBA(0xB29700ff),
       .inner_driven = RGBA(0x9000ccff),
       .inner_driven_sel = RGBA(0x9900e6ff),
       .inner_overridden = RGBA(0x19c3c300),
       .inner_overridden_sel = RGBA(0x118f8f00),
       .inner_changed = RGBA(0xcc7529ff),
-      .inner_changed_sel = RGBA(0xe6852dff),
-      .blend = 0.5f,
+      .inner_changed_sel = RGBA(0xD26400ff),
+      .blend = 0.4f,
     },
     .widget_emboss = RGBA(0x00000005),
     .menu_shadow_fac = 0.3f,
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index ec0b01d4341..0bf8247dc17 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2636,7 +2636,7 @@ static void widget_state_numslider(uiWidgetType *wt, int state, int drawflag)
     wt->wcol.item[0] = wt->wcol.item[1] = wt->wcol.item[2] = rgb_to_grayscale_byte(
         (const uchar *)wt->wcol.item);
     widget_state_blend(wt->wcol.item, color_blend, wcol_state->blend);
-    rgb_ensure_contrast(wt->wcol.item, wt->wcol.inner, 20);
+    rgb_ensure_contrast(wt->wcol.item, wt->wcol.inner, 30);
   }
 
   if (state & UI_SELECT) {