griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #139157: Fix Movement of Numbers in animation editors

Browse Source 
Both horizontal and vertical scale indicators rely on string measuring
for proper positioning. But in order to always do this reliably the
font's size needs to be set explicitly. Otherwise the font size could
be incorrect from prior use so the measurement is wrong, but then the
size is correctly set when drawing occurs. It draws at the right size
but at wrong position.

Pull Request: https://projects.blender.org/blender/blender/pulls/139549
This commit is contained in:
Harley Acheson
2025-05-28 21:39:50 +02:00
committed by Harley Acheson
parent 5de2d48921
commit fbace1066d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/interface/view2d/view2d_draw.cc
View File

@@ -295,7 +295,7 @@ static void draw_horizontal_scale_indicators(const ARegion *region,
GPU_matrix_push_projection();
wmOrtho2_region_pixelspace(region);
const int font_id = BLF_default();
const int font_id = BLF_set_default();
UI_FontThemeColor(font_id, colorid);
BLF_batch_draw_begin();
@@ -327,7 +327,8 @@ static void draw_horizontal_scale_indicators(const ARegion *region,
const float text_width = BLF_width(font_id, text, strlen(text));
if (xpos_region - text_width / 2.0f >= xmin && xpos_region + text_width / 2.0f <= xmax) {
BLF_draw_default(xpos_region - text_width / 2.0f, ypos, 0.0f, text, sizeof(text));
BLF_draw_default(
xpos_region - std::trunc(text_width / 2.0f), ypos, 0.0f, text, sizeof(text));
}
}
}
@@ -369,7 +370,7 @@ static void draw_vertical_scale_indicators(const ARegion *region,
GPU_matrix_push_projection();
wmOrtho2_region_pixelspace(region);
const int font_id = BLF_default();
const int font_id = BLF_set_default();
UI_FontThemeColor(font_id, colorid);
BLF_batch_draw_begin();