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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-24 18:47:40 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-24 18:51:13 +0300
commitd0856d1d546a07acf29e3a2ac873fe7dc1d7c61b (patch)
treef6a825e6320129813f9dfd19ed964549da411513 /source/blender/editors/interface/interface_widgets.c
parent645431903317c55eab051284c2fa085f57c1543a (diff)
Fix most of 'disappearing' first letter in right-aligned labels.
BLF' blf_font_width_to_strlen() could easily generate strings with up to nearly two pixels length over requested limit! Note that the fiddling between floats and ints values make things really confusing here... :/ There is still a few limit cases where, even though computed str length is now always below reauested limit, we still get first letter disappearing, no idea why currently.
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r--source/blender/editors/interface/interface_widgets.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 3b7ccb68fd4..a6f58fc056a 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1500,6 +1500,8 @@ float UI_text_clip_middle_ex(
BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
}
+ BLI_assert(strwidth <= okwidth);
+
return strwidth;
}