[Bf-blender-cvs] [82323cafb96] temp-ui-tweaks: UI: Fix dark and light themes
Pablo Vazquez
noreply at git.blender.org
Fri Aug 27 20:57:56 CEST 2021
Commit: 82323cafb96e66516e39d008690e2d542c8affea
Author: Pablo Vazquez
Date: Fri Aug 27 20:57:26 2021 +0200
Branches: temp-ui-tweaks
https://developer.blender.org/rB82323cafb96e66516e39d008690e2d542c8affea
UI: Fix dark and light themes
Mainly so it doesn't look broken to people testing out the branch, namely
the background of radio buttons was pure white, and separator in menus pure black.
Also minor tweaks to the default theme.
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M release/scripts/presets/interface_theme/Blender_Light.xml
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 85532d01d5c..53be80a19fa 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -62,11 +62,11 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_radio = {
- .outline = RGBA(0x373737ff),
- .inner = RGBA(0x595959ff),
- .inner_sel = RGBA(0x5680c2e6),
- .item = RGBA(0xffffffff),
- .text = RGBA(0xe6e6e6ff),
+ .outline = RGBA(0x2c2c2cff),
+ .inner = RGBA(0x2c2c2cff),
+ .inner_sel = RGBA(0x476da3ff),
+ .item = RGBA(0x2c2c2cff),
+ .text = RGBA(0xccccccff),
.text_sel = RGBA(0xffffffff),
.shadetop = 5,
.shadedown = -5,
@@ -74,9 +74,9 @@ const bTheme U_theme_default = {
},
.wcol_option = {
.outline = RGBA(0x373737ff),
- .inner = RGBA(0x666666ff),
- .inner_sel = RGBA(0x5680c2e6),
- .item = RGBA(0xffffffff),
+ .inner = RGBA(0x1f1f1fff),
+ .inner_sel = RGBA(0x71a8ffe6),
+ .item = RGBA(0x1f1f1fff),
.text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff),
.shadedown = -15,
@@ -84,8 +84,8 @@ const bTheme U_theme_default = {
},
.wcol_toggle = {
.outline = RGBA(0x373737ff),
- .inner = RGBA(0x595959ff),
- .inner_sel = RGBA(0x5680c2e6),
+ .inner = RGBA(0x2c2c2cff),
+ .inner_sel = RGBA(0x476da3ff),
.item = RGBA(0x191919ff),
.text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff),
@@ -93,8 +93,8 @@ const bTheme U_theme_default = {
},
.wcol_num = {
.outline = RGBA(0x444444ff),
- .inner = RGBA(0x595959ff),
- .inner_sel = RGBA(0x505050ff),
+ .inner = RGBA(0x4f4f4fff),
+ .inner_sel = RGBA(0x1f1f1fff),
.item = RGBA(0x191919ff),
.text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff),
@@ -102,9 +102,9 @@ const bTheme U_theme_default = {
},
.wcol_numslider = {
.outline = RGBA(0x444444ff),
- .inner = RGBA(0x595959ff),
+ .inner = RGBA(0x2c2c2cff),
.inner_sel = RGBA(0x505050ff),
- .item = RGBA(0x5680c2e6),
+ .item = RGBA(0x5680c2ff),
.text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff),
.shaded = 1,
@@ -112,9 +112,9 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_tab = {
- .outline = RGBA(0x202020ff),
- .inner = RGBA(0x2b2b2bff),
- .inner_sel = RGBA(0x424242ff),
+ .outline = RGBA(0x1a1a1aff),
+ .inner = RGBA(0x1a1a1aff),
+ .inner_sel = RGBA(0x2e2e2eff),
.item = RGBA(0x2d2d2dff),
.text = RGBA(0x989898ff),
.text_sel = RGBA(0xffffffff),
@@ -123,7 +123,7 @@ const bTheme U_theme_default = {
.wcol_menu = {
.outline = RGBA(0x444444ff),
.inner = RGBA(0x2c2c2cff),
- .inner_sel = RGBA(0x696e76ff),
+ .inner_sel = RGBA(0x476da3ff),
.item = RGBA(0xd9d9d9ff),
.text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff),
@@ -133,8 +133,8 @@ const bTheme U_theme_default = {
},
.wcol_pulldown = {
.outline = RGBA(0x4d4d4dff),
- .inner = RGBA(0x2e2e2ecc),
- .inner_sel = RGBA(0x5680c2e6),
+ .inner = RGBA(0x00000033),
+ .inner_sel = RGBA(0x476da3ff),
.item = RGBA(0x727272ff),
.text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff),
@@ -144,7 +144,7 @@ const bTheme U_theme_default = {
},
.wcol_menu_back = {
.outline = RGBA(0x19191aff),
- .inner = RGBA(0x1f1f1fef),
+ .inner = RGBA(0x1a1a1aff),
.inner_sel = RGBA(0x585858ff),
.item = RGBA(0x727272ff),
.text = RGBA(0xa5a5a5ff),
@@ -154,7 +154,8 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_menu_item = {
- .inner_sel = RGBA(0x5680c2e6),
+ .outline = RGBA(0x37373700),
+ .inner_sel = RGBA(0x476da3ff),
.item = RGBA(0xffffff8f),
.text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff),
@@ -173,7 +174,7 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_box = {
- .outline = RGBA(0x444444ff),
+ .outline = RGBA(0x262626ff),
.inner = RGBA(0x00000033),
.inner_sel = RGBA(0x696e76ff),
.item = RGBA(0x191919ff),
@@ -237,7 +238,7 @@ const bTheme U_theme_default = {
.widget_emboss = RGBA(0x00000026),
.menu_shadow_fac = 0.3f,
.menu_shadow_width = 4,
- .editor_outline = RGBA(0x1f1f1fff),
+ .editor_outline = RGBA(0x1a1a1aff),
.transparent_checker_primary = RGBA(0x333333ff),
.transparent_checker_secondary = RGBA(0x262626ff),
.transparent_checker_size = 8,
@@ -262,11 +263,11 @@ const bTheme U_theme_default = {
.icon_folder = RGBA(0xe3c16eff),
},
.space_properties = {
- .back = RGBA(0x42424200),
+ .back = RGBA(0x2e2e2e00),
.title = RGBA(0xd4d4d4ff),
.text = RGBA(0xe6e6e6ff),
.text_hi = RGBA(0xffffffff),
- .header = RGBA(0x424242ff),
+ .header = RGBA(0x2e2e2eff),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_active = RGBA(0x4b4b4bff),
@@ -277,24 +278,24 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xe5e5e5ff),
.button_text_hi = RGBA(0xffffffff),
- .navigation_bar = RGBA(0x232323ff),
+ .navigation_bar = RGBA(0x1a1a1aff),
.panelcolors = {
- .header = RGBA(0x424242ff),
+ .header = RGBA(0x383838ff),
.back = RGBA(0x383838ff),
- .sub_back = RGBA(0x00000024),
+ .sub_back = RGBA(0x0000003e),
},
+ .active = RGBA(0x5680c2ff),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
.match = RGBA(0x5680c2ff),
- .active = RGBA(0x5680c2ff),
},
.space_view3d = {
- .back = RGBA(0x393939ff),
+ .back = RGBA(0x2c2c2cff),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
.text_hi = RGBA(0xffffffff),
- .header = RGBA(0x42424200),
+ .header = RGBA(0x2e2e2e00),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_active = RGBA(0x4b4b4bff),
@@ -306,8 +307,8 @@ const bTheme U_theme_default = {
.button_text = RGBA(0xe5e5e5ff),
.button_text_hi = RGBA(0xffffffff),
.panelcolors = {
- .header = RGBA(0x424242e6),
- .back = RGBA(0x333333f0),
+ .header = RGBA(0x383838ff),
+ .back = RGBA(0x383838ff),
.sub_back = RGBA(0x0000003e),
},
.grid = RGBA(0x6666664d),
@@ -398,8 +399,8 @@ const bTheme U_theme_default = {
.button_text_hi = RGBA(0xffffffff),
.execution_buts = RGBA(0x444444ff),
.panelcolors = {
- .header = RGBA(0x4b4b4bff),
- .back = RGBA(0x404040ff),
+ .header = RGBA(0x383838ff),
+ .back = RGBA(0x383838ff),
.sub_back = RGBA(0x0000003e),
},
.hilite = RGBA(0x4f76b3ff),
@@ -429,8 +430,8 @@ const bTheme U_theme_default = {
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf29ff),
.panelcolors = {
- .header = RGBA(0x424242cc),
- .back = RGBA(0x333333b3),
+ .header = RGBA(0x383838ff),
+ .back = RGBA(0x383838ff),
.sub_back = RGBA(0x0000003e),
},
.shade1 = RGBA(0x96969600),
@@ -480,8 +481,8 @@ const bTheme U_theme_default = {
.button_text = RGBA(0xe5e5e5ff),
.button_text_hi = RGBA(0xffffffff),
.panelcolors = {
- .header = RGBA(0x424242cc),
- .back = RGBA(0x333333b3),
+ .header = RGBA(0x383838ff),
+ .back = RGBA(0x383838ff),
.sub_back = RGBA(0x0000003e),
},
.vertex_size = 3,
@@ -523,8 +524,8 @@ const bTheme U_theme_default = {
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf29ff),
.panelcolors = {
- .header = RGBA(0x424242cc),
- .back = RGBA(0x333333b3),
+ .header = RGBA(0x383838ff),
+ .back = RGBA(0x383838ff),
.sub_back = RGBA(0x0000003e),
},
.shade1 = RGBA(0xc0c0c000),
@@ -583,8 +584,8 @@ const bTheme U_theme_default = {
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf29ff),
.panelcolors = {
- .header = RGBA(0x424242cc),
- .back = RGBA(0x333333b3),
+ .header = RGBA(0x383838ff),
+ .back = RGBA(0x383838ff),
.sub_back = RGBA(0x0000003e),
},
.shade1 = RGBA(0x96969600),
@@ -633,8 +634,8 @@ const bTheme U_theme_default = {
.button_text = RGBA(0xe5e5e5ff),
.button_text_hi = RGBA(0xffffffff),
.panelcolors = {
- .header = RGBA(0x424242cc),
- .back = RGBA(0x333333b3),
+ .header = RGBA(0x383838ff),
+ .back = RGBA(0x383838ff),
.sub_back = RGBA(0x0000003e),
},
.shade1 = RGBA(0xa0a0a000),
@@ -663,16 +664,16 @@ const bTheme U_theme_default = {
.selected_strip = RGBA(0xff8f0dff),
.gp_vertex_size = 3,
.gp_vertex_select = RGBA(0xff8500ff),
+ .row_alternate = RGBA(0xffffff0d),
.anim_preview_range = RGBA(0xa14d0066),
.metadatatext = RGBA(0xffffffff),
- .row_alternate = RGBA(0xffffff0d),
},
.space_image = {
- .back = RGBA(0x44444400),
+ .back = RGBA(0x2e2e2e00),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
.text_hi = RGBA(0xffffffff),
- .header = RGBA(0x424242ff),
+ .header = RGBA(0x2e2e2eff),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_active = RGBA(0x4b4b4bff),
@@ -684,8 +685,8 @@ const bTheme U_theme_default = {
.button_text = RGBA(0xe5e5e5ff),
.button_text_hi = RGBA(0xffffffff),
.panelcolors = {
- .header = RGBA(0x424242cc),
- .back = RGBA(0x333333b3),
+ .header = RGBA(0x383838ff),
+ .back = RGBA(0x383838ff),
.sub_back = RGBA(0x0000003e),
},
.grid = RGBA(0x505050ff),
@@ -738,8 +739,8 @@ const bTheme U_theme_default = {
.button_text = RGBA(0xe5e5e5ff),
.button_text_hi = RGBA(0xffffffff),
.panelcolors = {
- .header = RGBA(0x42424200),
- .back = RGBA(0x333333b3),
+ .header = RGBA(0x383838ff),
+ .back = RGBA(0x383838ff),
.sub_back = RGBA(0x0000003e),
},
.shade2 = RGBA(0x5680c2e6),
@@ -759,11 +760,11 @@ const bTheme U_theme_default = {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list