diff options
| author | Paul (Thirio) <paul@paulcoops.com> | 2019-11-25 19:36:05 +0300 |
|---|---|---|
| committer | Harley Acheson <harley.acheson@gmail.com> | 2019-11-25 19:36:05 +0300 |
| commit | b374b24f1b2dea4360f318fe3c86bede00bdaae4 (patch) | |
| tree | 81e74e8b8103c9dca6f21bf00036367c1d470bf3 /source/blender/editors | |
| parent | 78071d0cdfe53bf9dd7baa1a7204b1e148b7574b (diff) | |
UI: Widget Text Cursor Color
Adds a theme setting to specify color of widget text insertion cursor (caret).
Differential Revision: https://developer.blender.org/D6024
Reviewed by Campbell Barton
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/resources.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index c909c9b8d58..738a91c085d 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -293,7 +293,7 @@ typedef enum ThemeColorID { TH_NLA_SOUND_SEL, TH_WIDGET_EMBOSS, - + TH_WIDGET_TEXT_CURSOR, TH_EDITOR_OUTLINE, TH_AXIS_X, /* X/Y/Z Axis */ diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index df2b78e0a6f..f2027d491fb 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2227,7 +2227,7 @@ static void widget_draw_text(const uiFontStyle *fstyle, immVertexFormat(), "pos", GPU_COMP_I32, 2, GPU_FETCH_INT_TO_FLOAT); immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); - immUniformColor3f(0.2f, 0.6f, 0.9f); + immUniformThemeColor(TH_WIDGET_TEXT_CURSOR); but_cursor_shape.xmin = (rect->xmin + t) - U.pixelsize; but_cursor_shape.ymin = rect->ymin + U.pixelsize; diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index a4dd0cb5c9f..99833e9200d 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -872,6 +872,9 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case TH_EDITOR_OUTLINE: cp = btheme->tui.editor_outline; break; + case TH_WIDGET_TEXT_CURSOR: + cp = btheme->tui.widget_text_cursor; + break; case TH_AXIS_X: cp = btheme->tui.xaxis; break; |