Commit: f59ce4d55c04a61a10d9e9567b53ee652972b60a Author: Hans Goudey Date: Tue Sep 15 10:34:38 2020 -0500 Branches: master https://developer.blender.org/rBf59ce4d55c04a61a10d9e9567b53ee652972b60a
Property Search: Add "search match" theme color We will use a highlight on panel headers to convey that they have a search match, so this commit initializes the theme color for the properties editor. Differential Revision: https://developer.blender.org/D8854 =================================================================== M release/datafiles/userdef/userdef_default_theme.c M release/scripts/presets/interface_theme/blender_light.xml M source/blender/blenloader/intern/versioning_userdef.c M source/blender/makesrna/intern/rna_userdef.c =================================================================== diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index cd6be1903ec..791630a1a9c 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -262,6 +262,7 @@ const bTheme U_theme_default = { .icon_folder = RGBA(0xe3c16eff), }, .space_properties = { + .match = RGBA(0x5680c2ff), .back = RGBA(0x42424200), .title = RGBA(0xd4d4d4ff), .text = RGBA(0xe6e6e6ff), diff --git a/release/scripts/presets/interface_theme/blender_light.xml b/release/scripts/presets/interface_theme/blender_light.xml index 1b48377f62c..53e2571ae8c 100644 --- a/release/scripts/presets/interface_theme/blender_light.xml +++ b/release/scripts/presets/interface_theme/blender_light.xml @@ -845,7 +845,9 @@ </ThemeSequenceEditor> </sequence_editor> <properties> - <ThemeProperties> + <ThemeProperties + match="#5680c2" + > <space> <ThemeSpaceGeneric back="#b3b3b3" diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 955725f0ea7..a0a60630986 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -236,6 +236,8 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) */ { /* Keep this block, even when empty. */ + + FROM_DEFAULT_V4_UCHAR(space_properties.match); } #undef FROM_DEFAULT_V4_UCHAR diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 1ecd0a581b6..868c804b4a3 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2952,7 +2952,7 @@ static void rna_def_userdef_theme_space_node(BlenderRNA *brna) static void rna_def_userdef_theme_space_buts(BlenderRNA *brna) { StructRNA *srna; - // PropertyRNA *prop; + PropertyRNA *prop; /* space_buts */ @@ -2961,6 +2961,11 @@ static void rna_def_userdef_theme_space_buts(BlenderRNA *brna) RNA_def_struct_clear_flag(srna, STRUCT_UNDO); RNA_def_struct_ui_text(srna, "Theme Properties", "Theme settings for the Properties"); + prop = RNA_def_property(srna, "match", PROP_FLOAT, PROP_COLOR_GAMMA); + RNA_def_property_array(prop, 3); + RNA_def_property_ui_text(prop, "Search Match", ""); + RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); + rna_def_userdef_theme_spaces_main(srna); } _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
