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

UI: Theme: Remove NavBar/Execution regions colors

Browse Source 
Remove barely used theme settings for "Navigation Bar" and
"Execution Region".

These properties were only used in two areas, which already had a good
candidate to be replaced with.

Visually it should look exactly the same by default.

Part of #135192, simplifying and cleaning up theme settings.

See PR for details and screenshots.

Pull Request: https://projects.blender.org/blender/blender/pulls/140352
This commit is contained in:
Pablo Vazquez
2025-06-18 19:01:28 +02:00
committed by Pablo Vazquez
parent d88d4cc8ce
commit dd43eae0d3
7 changed files with 9 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,8 +285,6 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xccccccff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x1d1d1dff),
.active = RGBA(0x4772b3ff),
.vertex_size = 3,
.outline_width = 1,
@@ -307,8 +305,6 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.grid = RGBA(0x54545480),
.wire = RGBA(0x000000ff),
.wire_edit = RGBA(0x000000ff),
@@ -398,8 +394,6 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x303030ff),
.execution_buts = RGBA(0x303030ff),
.hilite = RGBA(0x4772b3ff),
.vertex_size = 3,
.outline_width = 1,
@@ -423,8 +417,6 @@ const bTheme U_theme_default = {
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.shade1 = RGBA(0x96969600),
.shade2 = RGBA(0x12121264),
.grid = RGBA(0x1a1a1aff),
@@ -468,8 +460,6 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
@@ -502,8 +492,6 @@ const bTheme U_theme_default = {
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.shade1 = RGBA(0xc0c0c000),
.shade2 = RGBA(0x1d1d1d99),
.hilite = RGBA(0x60c04044),
@@ -559,8 +547,6 @@ const bTheme U_theme_default = {
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.shade1 = RGBA(0x96969600),
.grid = RGBA(0x2a2a2aff),
.strip = RGBA(0x0d0d0d80),
@@ -607,8 +593,6 @@ const bTheme U_theme_default = {
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xffffffff),
.list_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.shade1 = RGBA(0xa0a0a000),
.grid = RGBA(0x303030ff),
.vertex_select = RGBA(0xff8500ff),
@@ -670,8 +654,6 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.grid = RGBA(0x303030ff),
.wire_edit = RGBA(0xc0c0c0ff),
.vertex_select = RGBA(0xff8500ff),
@@ -719,8 +701,6 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.shade2 = RGBA(0x4d4d4de6),
.hilite = RGBA(0x71a8ffff),
.grid = RGBA(0x1d1d1dff),
@@ -750,8 +730,6 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.active = RGBA(0x334d80ff),
.vertex_size = 3,
.outline_width = 1,
@@ -780,8 +758,6 @@ const bTheme U_theme_default = {
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.shade2 = RGBA(0x7f7f7f64),
.grid = RGBA(0x28282800),
.wire = RGBA(0x1a1a1aff),
@@ -830,13 +806,11 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x1d1d1dff),
.tab_back = RGBA(0x30303000),
.button = RGBA(0x303030ff),
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x303030ff),
.execution_buts = RGBA(0x303030ff),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
@@ -854,8 +828,6 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.console_output = RGBA(0x71a8ffff),
.console_input = RGBA(0xf2f2f2ff),
.console_info = RGBA(0x95d600ff),
@@ -883,8 +855,6 @@ const bTheme U_theme_default = {
.list_title = RGBA(0xffffff00),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.grid = RGBA(0x181818ff),
.strip = RGBA(0xffffff80),
.strip_select = RGBA(0xff8c00ff),
@@ -929,8 +899,6 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xccccccff),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
@@ -948,8 +916,6 @@ const bTheme U_theme_default = {
.button = RGBA(0x30303000),
.button_text = RGBA(0xcccccc00),
.button_text_hi = RGBA(0xffffffff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
@@ -972,8 +938,6 @@ const bTheme U_theme_default = {
.list_title = RGBA(0xc3c3c3ff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.hilite = RGBA(0x80808080),
.active = RGBA(0x3b5689ff),
.vertex_size = 3,

36
scripts/presets/interface_theme/Blender_Light.xml
View File

@@ -471,8 +471,6 @@
button_title="#1a1a1a"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#656565ff"
>
<gradients>
@@ -535,8 +533,6 @@
button_title="#1a1a1a"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#999999ff"
>
</ThemeSpaceGeneric>
@@ -570,8 +566,6 @@
button_title="#1a1a1a"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#999999e6"
tab_back="#999999ff"
>
</ThemeSpaceGeneric>
@@ -618,8 +612,6 @@
button_title="#000000"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#404040ff"
>
</ThemeSpaceGeneric>
@@ -685,8 +677,6 @@
button_title="#000000"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#404040ff"
>
</ThemeSpaceGeneric>
@@ -761,8 +751,6 @@
button_title="#1a1a1a"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#656565ff"
>
</ThemeSpaceGeneric>
@@ -822,8 +810,6 @@
button_title="#1a1a1a"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#656565ff"
>
</ThemeSpaceGeneric>
@@ -857,8 +843,6 @@
button_title="#000000"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#a6a6a6ff"
execution_buts="#00000000"
tab_back="#404040ff"
>
</ThemeSpaceGeneric>
@@ -893,8 +877,6 @@
button_title="#000000"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#404040ff"
>
</ThemeSpaceGeneric>
@@ -950,8 +932,6 @@
button_title="#1a1a1a"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#656565ff"
>
</ThemeSpaceGeneric>
@@ -990,8 +970,6 @@
button_title="#000000"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#404040ff"
>
</ThemeSpaceGeneric>
@@ -1025,8 +1003,6 @@
button_title="#000000"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#404040ff"
>
</ThemeSpaceGeneric>
@@ -1048,8 +1024,6 @@
button_title="#000000"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#b3b3b3ff"
execution_buts="#b3b3b3ff"
tab_back="#404040ff"
>
</ThemeSpaceGeneric>
@@ -1078,8 +1052,6 @@
button_title="#ffffff"
button_text="#cccccc"
button_text_hi="#ffffff"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#404040ff"
>
</ThemeSpaceGeneric>
@@ -1133,8 +1105,6 @@
button_title="#000000"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#404040ff"
>
</ThemeSpaceGeneric>
@@ -1165,8 +1135,6 @@
button_title="#ffffff"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#28292dff"
>
</ThemeSpaceGeneric>
@@ -1188,8 +1156,6 @@
button_title="#ffffff"
button_text="#ffffff"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#00000000"
tab_back="#28292dff"
>
</ThemeSpaceGeneric>
@@ -1213,8 +1179,6 @@
button_title="#1a1a1a"
button_text="#000000"
button_text_hi="#000000"
navigation_bar="#00000000"
execution_buts="#999999e6"
tab_back="#999999ff"
>
</ThemeSpaceGeneric>

2
source/blender/blenkernel/BKE_blender_version.h
View File

@@ -27,7 +27,7 @@
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 17
#define BLENDER_FILE_SUBVERSION 18
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and cancel loading the file, showing a warning to

4
source/blender/blenloader/intern/versioning_userdef.cc
View File

@@ -322,6 +322,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(asset_shelf.back);
}
if (!USER_VERSION_ATLEAST(500, 18)) {
FROM_DEFAULT_V4_UCHAR(space_preferences.button);
}
/**
* Always bump subversion in BKE_blender_version.h when adding versioning
* code here, and wrap it inside a USER_VERSION_ATLEAST check.

5
source/blender/editors/interface/resources.cc
View File

@@ -176,10 +176,7 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
cp = ts->header;
}
else if (g_theme_state.regionid == RGN_TYPE_NAV_BAR) {
cp = ts->navigation_bar;
}
else if (g_theme_state.regionid == RGN_TYPE_EXECUTE) {
cp = ts->execution_buts;
cp = ts->tab_back;
}
else if (g_theme_state.regionid == RGN_TYPE_ASSET_SHELF) {
cp = btheme->asset_shelf.back;

6
source/blender/makesdna/DNA_theme_types.h
View File

@@ -257,12 +257,6 @@ typedef struct ThemeSpace {
unsigned char list_text[4];
unsigned char list_text_hi[4];
/* navigation bar regions */
/** Region background. */
unsigned char navigation_bar[4];
/** Region background. */
unsigned char execution_buts[4];
unsigned char shade1[4];
unsigned char shade2[4];

12
source/blender/makesrna/intern/rna_userdef.cc
View File

@@ -2176,20 +2176,10 @@ static void rna_def_userdef_theme_space_common(StructRNA *srna)
RNA_def_property_ui_text(prop, "Region Text Highlight", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "navigation_bar", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Navigation Bar Background", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "execution_buts", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Execution Region Background", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
/* tabs */
prop = RNA_def_property(srna, "tab_back", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Tab Background", "");
RNA_def_property_ui_text(prop, "Navigation/Tabs Background", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
}