Commit: b02e8e3504698e7a1c9a82e3ec30e7bede277222 Author: Hans Goudey Date: Thu Jul 30 17:42:42 2020 -0400 Branches: property-search-ui-v2 https://developer.blender.org/rBb02e8e3504698e7a1c9a82e3ec30e7bede277222
Property Search: Add "search match" theme color =================================================================== M release/datafiles/userdef/userdef_default_theme.c M source/blender/blenloader/intern/versioning_userdef.c M source/blender/editors/include/UI_resources.h M source/blender/editors/interface/resources.c M source/blender/makesdna/DNA_userdef_types.h 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 4d48bb8eaac..7de5a18bd86 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -269,6 +269,7 @@ const bTheme U_theme_default = { .header = RGBA(0x424242ff), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), + .search_match_color = RGBA(0x5680c2ff), .tab_active = RGBA(0x4b4b4bff), .tab_inactive = RGBA(0x2b2b2bff), .tab_back = RGBA(0x232323ff), diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index e2dc27d7e88..8d934dc036f 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -227,6 +227,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) */ { /* Keep this block, even when empty. */ + FROM_DEFAULT_V4_UCHAR(space_properties.search_match_color); } #undef FROM_DEFAULT_V4_UCHAR diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index c5c4ca79f14..2da44a203fe 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -68,6 +68,7 @@ typedef enum ThemeColorID { TH_HEADERDESEL, TH_HEADER_TEXT, TH_HEADER_TEXT_HI, + TH_SEARCH_MATCH, /* panels */ TH_PANEL_HEADER, diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 84fe3e13426..44bd42d6842 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -261,6 +261,9 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case TH_HEADER_TEXT_HI: cp = ts->header_text_hi; break; + case TH_SEARCH_MATCH: + cp = ts->search_match_color; + break; case TH_PANEL_HEADER: cp = ts->panelcolors.header; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index d50c0055499..3d1d59d438c 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -265,6 +265,8 @@ typedef struct ThemeSpace { /* note, cannot use name 'panel' because of DNA mapping old files */ uiPanelColors panelcolors; + unsigned char search_match_color[4]; + unsigned char shade1[4]; unsigned char shade2[4]; @@ -328,7 +330,7 @@ typedef struct ThemeSpace { unsigned char syntaxd[4], syntaxr[4]; // in nodespace used for distort unsigned char line_numbers[4]; - char _pad6[7]; + char _pad6[3]; unsigned char nodeclass_output[4], nodeclass_filter[4]; unsigned char nodeclass_vector[4], nodeclass_texture[4]; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 6ce6098d0c3..b762e08526c 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1719,6 +1719,11 @@ static void rna_def_userdef_theme_space_common(StructRNA *srna) RNA_def_property_ui_text(prop, "Header Text Highlight", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); + prop = RNA_def_property(srna, "search_match_color", PROP_FLOAT, PROP_COLOR_GAMMA); + RNA_def_property_array(prop, 3); + RNA_def_property_ui_text(prop, "Search Match Color", ""); + RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); + /* panel settings */ prop = RNA_def_property(srna, "panelcolors", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs