diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-12-02 01:56:48 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-12-02 02:01:36 +0300 |
commit | 5cbf58ce8b5463a0c3296a753c26615c357aca17 (patch) | |
tree | cab85fcfd0bc5f8ca8effc8dd2f6be8803eefd00 /source/blender/editors | |
parent | a6bbf05ba6268638f5e131fe8a7db5a90e5d7c60 (diff) |
Fix T46909: Text strip not themeable
Normally we don't allow adding new theme options if we can avoid it, but this is a legit exception since all other strips are themeable.
Default color for text strip is now yellow-ish. Not nice but there are also not many other colors left.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 3 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 6 |
3 files changed, 17 insertions, 2 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index cd68425cc33..dc843952229 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -200,8 +200,9 @@ enum { TH_SEQ_EFFECT, TH_SEQ_TRANSITION, TH_SEQ_META, + TH_SEQ_TEXT, TH_SEQ_PREVIEW, - + TH_EDGE_SHARP, TH_EDITMESH_ACTIVE, diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 294aa6ce2ac..5fb1afac34f 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -492,6 +492,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo cp = ts->transition; break; case TH_SEQ_META: cp = ts->meta; break; + case TH_SEQ_TEXT: + cp = ts->text_strip; break; case TH_SEQ_PREVIEW: cp = ts->preview_back; break; @@ -1062,6 +1064,7 @@ void ui_theme_init_default(void) rgba_char_args_set(btheme->tseq.effect, 169, 84, 124, 255); rgba_char_args_set(btheme->tseq.transition, 162, 95, 111, 255); rgba_char_args_set(btheme->tseq.meta, 109, 145, 131, 255); + rgba_char_args_set(btheme->tseq.text_strip, 162, 151, 0, 255); rgba_char_args_set(btheme->tseq.preview_back, 0, 0, 0, 255); rgba_char_args_set(btheme->tseq.grid, 64, 64, 64, 255); @@ -2668,6 +2671,13 @@ void init_userdef_do_versions(void) } } + if (!USER_VERSION_ATLEAST(276, 3)) { + bTheme *btheme; + for (btheme = U.themes.first; btheme; btheme = btheme->next) { + rgba_char_args_set(btheme->tseq.text_strip, 162, 151, 0, 255); + } + } + if (U.pixelsize == 0.0f) U.pixelsize = 1.0f; diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 6c76dbd5149..e9539bcc4c9 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -177,7 +177,11 @@ void color3ubv_from_seq(Scene *curscene, Sequence *seq, unsigned char col[3]) blendcol[0] = blendcol[1] = blendcol[2] = 128; if (seq->flag & SEQ_MUTE) UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.5, 20); break; - + + case SEQ_TYPE_TEXT: + UI_GetThemeColor3ubv(TH_SEQ_TEXT, col); + break; + default: col[0] = 10; col[1] = 255; col[2] = 40; break; |