griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T79615: UI: icons and widget emboss look different from earlier versions

Browse Source 
Both the default theme and Blender Light have been updated.

Blender Light also includes automatically generated colors based on the
default theme that were not set previously.
This commit is contained in:
Pablo Vazquez
2020-10-08 16:17:20 +02:00
parent 70a8498cec
commit 4ee1332bdf
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
release/datafiles/userdef/userdef_default_theme.c
View File

@@ -45,7 +45,7 @@ const bTheme U_theme_default = {
.outline = RGBA(0x373737ff),
.inner = RGBA(0x313131ff),
.inner_sel = RGBA(0x5680c2ff),
.item = RGBA(0xffffff8f),
.item = RGBA(0xe6e6e6cc),
.text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff),
.roundness = 0.2f,
@@ -124,7 +124,7 @@ const bTheme U_theme_default = {
.outline = RGBA(0x444444ff),
.inner = RGBA(0x2c2c2cff),
.inner_sel = RGBA(0x696e76ff),
.item = RGBA(0xe6e6e6ff),
.item = RGBA(0xd9d9d9ff),
.text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff),
.shadetop = 10,
@@ -234,7 +234,7 @@ const bTheme U_theme_default = {
.inner_changed_sel = RGBA(0xd26400ff),
.blend = 0.5f,
},
.widget_emboss = RGBA(0x00000005),
.widget_emboss = RGBA(0x00000026),
.menu_shadow_fac = 0.3f,
.menu_shadow_width = 4,
.editor_outline = RGBA(0x1f1f1fff),
@@ -262,7 +262,6 @@ const bTheme U_theme_default = {
.icon_folder = RGBA(0xe3c16eff),
},
.space_properties = {
.match = RGBA(0x5680c2ff),
.back = RGBA(0x42424200),
.title = RGBA(0xd4d4d4ff),
.text = RGBA(0xe6e6e6ff),
@@ -287,6 +286,7 @@ const bTheme U_theme_default = {
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
.match = RGBA(0x5680c2ff),
},
.space_view3d = {
.back = RGBA(0x393939ff),
@@ -685,6 +685,7 @@ const bTheme U_theme_default = {
.back = RGBA(0x333333b3),
.sub_back = RGBA(0x0000003e),
},
.grid = RGBA(0x505050ff),
.wire_edit = RGBA(0xc0c0c0ff),
.vertex_select = RGBA(0xff8500ff),
.edge_select = RGBA(0xff8500ff),
@@ -716,7 +717,6 @@ const bTheme U_theme_default = {
.paint_curve_pivot = RGBA(0xff7f7f7f),
.paint_curve_handle = RGBA(0x7fff7f7f),
.metadatatext = RGBA(0xffffffff),
.grid = RGBA(0x505050ff),
},
.space_text = {
.back = RGBA(0x30303000),

18
release/scripts/presets/interface_theme/blender_light.xml
View File

@@ -6,9 +6,12 @@
menu_shadow_width="4"
icon_alpha="1"
icon_saturation="0.5"
widget_emboss="#00000005"
widget_emboss="#00000026"
editor_outline="#1f1f1f"
widget_text_cursor="#3399e6"
transparent_checker_primary="#333333"
transparent_checker_secondary="#262626"
transparent_checker_size="8"
axis_x="#ff3352"
axis_y="#8bdc00"
axis_z="#2890ff"
@@ -62,7 +65,7 @@
outline="#363636"
inner="#434343ff"
inner_sel="#5680c2ff"
item="#ffffff8f"
item="#e6e6e6cc"
text="#e6e6e6"
text_sel="#ffffff"
show_shaded="FALSE"
@@ -74,7 +77,7 @@
</wcol_toolbar_item>
<wcol_radio>
<ThemeWidgetColors
outline="#3b3b3b"
outline="#434343"
inner="#3b3b3bff"
inner_sel="#5680c2e6"
item="#ffffffff"
@@ -182,7 +185,7 @@
outline="#3b3b3b"
inner="#3b3b3bff"
inner_sel="#767676ff"
item="#e6e6e6ff"
item="#808080ff"
text="#d9d9d9"
text_sel="#ffffff"
show_shaded="FALSE"
@@ -330,7 +333,7 @@
</wcol_state>
<wcol_tab>
<ThemeWidgetColors
outline="#808080"
outline="#656565"
inner="#818181ff"
inner_sel="#b3b3b3ff"
item="#28292dff"
@@ -364,6 +367,7 @@
speaker="#000000"
vertex="#000000"
vertex_select="#ff8500"
vertex_active="#000000"
vertex_size="3"
vertex_bevel="#00a5ff"
vertex_unreferenced="#000000"
@@ -473,6 +477,7 @@
preview_range="#a14d0066"
vertex="#000000"
vertex_select="#ff8500"
vertex_active="#ffffff"
vertex_size="6"
vertex_bevel="#000000"
vertex_unreferenced="#000000"
@@ -534,8 +539,8 @@
</graph_editor>
<file_browser>
<ThemeFileBrowser
row_alternate="#ffffff0f"
selected_file="#5680c2"
row_alternate="#ffffff0f"
>
<space>
<ThemeSpaceGeneric
@@ -716,6 +721,7 @@
grid="#353535ff"
vertex="#000000"
vertex_select="#ff8500"
vertex_active="#000000"
vertex_size="3"
vertex_bevel="#000000"
vertex_unreferenced="#000000"