blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

UI: Improve contrast on playhead 

Add an outine around the playhead, matching the color of the background (slightly darkened)
to improve the readability of the current frame line when placed against curves or strips
with a similar color.

{F10944336, size=full}

Differential Revision: https://developer.blender.org/D12810
This commit is contained in:
Pablo Vazquez 2021-10-17 19:06:45 +02:00 committed by Pablo Vazquez
parent 962b17b3ca
commit 452c78757f
Notes: blender-bot 2024-01-24 05:26:33 +01:00 
Referenced by issue #92503, OSL: Blender crashes when activating object with OSL material
Referenced by issue #92380, Blender can't access the locally shared and mapped folders on Windows
Referenced by issue #92270, Remeshing a Klein Bottle stops Blender
Referenced by issue #91604, Geometry nodes: object disabled for render but used in geometry nodes not working
Referenced by issue #92233, Slow camera view navigation in Cycles rendered shading mode with many instances
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/animation/time_scrub_ui.c
View File

@ -101,6 +101,7 @@ static void draw_current_frame(const Scene *scene,
float text_width = UI_fontstyle_string_width(fstyle, frame_str);
float box_width = MAX2(text_width + 8 * UI_DPI_FAC, 24 * UI_DPI_FAC);
float box_padding = 3 * UI_DPI_FAC;
const int line_outline = max_ii(1, round_fl_to_int(1 * UI_DPI_FAC));
float bg_color[4];
UI_GetThemeColorShade4fv(TH_CFRAME, -5, bg_color);
@ -109,7 +110,19 @@ static void draw_current_frame(const Scene *scene,
const float subframe_x = UI_view2d_view_to_region_x(v2d, BKE_scene_ctime_get(scene));
GPUVertFormat *format = immVertexFormat();
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
GPU_blend(GPU_BLEND_ALPHA);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
/* Outline. */
immUniformThemeColorShadeAlpha(TH_BACK, -25, -100);
immRectf(pos,
subframe_x - (line_outline + U.pixelsize),
scrub_region_rect->ymax - box_padding,
subframe_x + (line_outline + U.pixelsize),
0.0f);
/* Line. */
immUniformThemeColor(TH_CFRAME);
immRectf(pos,
subframe_x - U.pixelsize,
@ -117,6 +130,7 @@ static void draw_current_frame(const Scene *scene,
subframe_x + U.pixelsize,
0.0f);
immUnbindProgram();
GPU_blend(GPU_BLEND_NONE);
UI_draw_roundbox_corner_set(UI_CNR_ALL);