Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2012-01-22 10:10:21 +0400
committerJoshua Leung <aligorith@gmail.com>2012-01-22 10:10:21 +0400
commitd8d2dc552a47d521b1d8c93ce13d5216b31c72f0 (patch)
tree6663fbbb16eeae2ce2913fe18fc00a61989de0e7 /source/blender/editors/interface
parent57d48d4493a78d2886f83a28fe66c2654bed4f6c (diff)
Patch [#28608] Add search match colour to theme settings
Submitted by Shane Ambler (sambler) From patch description: As a follow on from #23443 - committed in r40066 I have added the outliner filter match highlight colour to the theme settings. Default colour is a light green matching what was originally hard coded.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/resources.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index ad20ff0b6dd..7cc9febc603 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -452,6 +452,14 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
cp= ts->camera_path; break;
case TH_LOCK_MARKER:
cp= ts->lock_marker; break;
+
+ case TH_MATCH:
+ cp= ts->match;
+ break;
+
+ case TH_SELECT_HIGHLIGHT:
+ cp= ts->selected_highlight;
+ break;
}
}
}
@@ -792,6 +800,9 @@ void ui_theme_init_default(void)
btheme->toops= btheme->tv3d;
SETCOLF(btheme->toops.back, 0.45, 0.45, 0.45, 1.0);
+ SETCOLF(btheme->toops.match, 0.2, 0.5, 0.2, 0.3); /* highlighting search match - soft green*/
+ SETCOLF(btheme->toops.selected_highlight, 0.51, 0.53, 0.55, 0.3);
+
/* space info */
btheme->tinfo= btheme->tv3d;
SETCOLF(btheme->tinfo.back, 0.45, 0.45, 0.45, 1.0);
@@ -1696,17 +1707,17 @@ void init_userdef_do_versions(void)
BLI_addtail(&U.addons, baddon);
}
}
-
+
if (bmain->versionfile < 260 || (bmain->versionfile == 260 && bmain->subversionfile < 5)) {
bTheme *btheme;
-
+
for(btheme= U.themes.first; btheme; btheme= btheme->next) {
SETCOL(btheme->tui.panel.header, 0, 0, 0, 25);
btheme->tui.icon_alpha= 1.0;
}
}
-
- if (bmain->versionfile < 262){
+
+ if (bmain->versionfile < 261 || (bmain->versionfile == 261 && bmain->subversionfile < 4)) {
bTheme *btheme;
for(btheme= U.themes.first; btheme; btheme= btheme->next) {
SETCOLF(btheme->tima.preview_stitch_face, 0.071, 0.259, 0.694, 0.150);
@@ -1715,10 +1726,14 @@ void init_userdef_do_versions(void)
SETCOLF(btheme->tima.preview_stitch_stitchable, 0.0, 1.0, 0.0, 1.0);
SETCOLF(btheme->tima.preview_stitch_unstitchable, 1.0, 0.0, 0.0, 1.0);
SETCOLF(btheme->tima.preview_stitch_active, 0.886, 0.824, 0.765, 0.140);
+
+ SETCOLF(btheme->toops.match, 0.2, 0.5, 0.2, 0.3);
+ SETCOLF(btheme->toops.selected_highlight, 0.51, 0.53, 0.55, 0.3);
}
+
U.use_16bit_textures = 0;
}
-
+
/* GL Texture Garbage Collection (variable abused above!) */
if (U.textimeout == 0) {
U.texcollectrate = 60;