[Bf-blender-cvs] [1290e63e7ee] filebrowser_redesign: Tweaks to theme colors

[Julian Eisel]

Commit: 1290e63e7eeaf3fd93a2df27d8f66c2aa9eed888
Author: Julian Eisel
Date:   Sun Aug 11 17:42:01 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rB1290e63e7eeaf3fd93a2df27d8f66c2aa9eed888

Tweaks to theme colors

Better addresses color clashes. rB5d99a8c083 made things appear too dark
for some screens.
Also fixes wrong versioning for execution region background color.

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

M	release/datafiles/userdef/userdef_default_theme.c
M	source/blender/blenloader/intern/versioning_userdef.c
M	source/blender/editors/space_file/file_draw.c

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

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index fc22e24d72f..abd0498ba4b 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -370,7 +370,7 @@ const bTheme U_theme_default = {
     .paint_curve_handle = RGBA(0x7fff7f7f),
   },
   .space_file = {
-    .back = RGBA(0x21212100),
+    .back = RGBA(0x33333300),
     .title = RGBA(0xffffffff),
     .text = RGBA(0xe6e6e6ff),
     .text_hi = RGBA(0xffffffff),
@@ -381,14 +381,14 @@ const bTheme U_theme_default = {
     .tab_inactive = RGBA(0x2b2b2bff),
     .tab_back = RGBA(0x232323ff),
     .tab_outline = RGBA(0x232323ff),
-    .button = RGBA(0x424242ff),
+    .button = RGBA(0x4b4b4bff),
     .button_title = RGBA(0xffffffff),
     .button_text = RGBA(0xe5e5e5ff),
     .button_text_hi = RGBA(0xffffffff),
-    .execution_buts = RGBA(0x424242ff),
+    .execution_buts = RGBA(0x444444ff),
     .panelcolors = {
-      .header = RGBA(0x424242cc),
-      .back = RGBA(0x333333b3),
+      .header = RGBA(0x4b4b4bff),
+      .back = RGBA(0x404040ff),
       .sub_back = RGBA(0x0000003e),
     },
     .hilite = RGBA(0x4f76b3ff),
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 88763b3459c..02c777ee9b9 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -145,7 +145,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
    * Include next version bump.
    */
   {
-    copy_v4_v4_uchar(btheme->space_file.execution_buts, btheme->space_file.button);
+    FROM_DEFAULT_V4_UCHAR(space_file.execution_buts);
   }
 
 #undef FROM_DEFAULT_V4_UCHAR
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 711555b028f..6e8dbda5e1c 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -412,7 +412,7 @@ static void draw_columnheader_background(const FileLayout *layout, const View2D
   uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 
   immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-  immUniformThemeColorShade(TH_BACK, 7);
+  immUniformThemeColorShade(TH_BACK, 11);
 
   immRectf(
       pos, v2d->cur.xmin, v2d->cur.ymax - layout->columnheader_h, v2d->cur.xmax, v2d->cur.ymax);