From f69c565a33ca58bb95a2bd22de0e211799508182 Mon Sep 17 00:00:00 2001 From: Ramil Roosileht Date: Wed, 8 Jun 2022 11:51:29 -0700 Subject: D15085: Fix numbers jumping in edit voxel size widget Introduces an option for BKE_unit_value_as_string to skip stripping of zeroes, thus reducing flickering when using edit voxel size widget. {F13125416} Reviewed By: Julien Kaspar & Joseph Eagar Differential Revision: https://developer.blender.org/D15085 Ref D15085 --- source/blender/blenkernel/intern/unit.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 30e02e5411b..2520ce5179f 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -460,11 +460,19 @@ static size_t unit_as_string(char *str, } double value_conv = (value / unit->scalar) - unit->bias; + bool strip_skip; /* Adjust precision to expected number of significant digits. * Note that here, we shall not have to worry about very big/small numbers, units are expected * to replace 'scientific notation' in those cases. */ prec -= integer_digits_d(value_conv); + + /* Negative precision is used to disable stripping of zeroes. This reduces text jumping when changing values. */ + if (prec < 0) { + strip_skip = true; + prec *= -1; + } + CLAMP(prec, 0, 6); /* Convert to a string. */ @@ -478,8 +486,10 @@ static size_t unit_as_string(char *str, size_t i = len - 1; if (prec > 0) { - while (i > 0 && str[i] == '0') { /* 4.300 -> 4.3 */ - str[i--] = pad; + if (!strip_skip) { + while (i > 0 && str[i] == '0') { /* 4.300 -> 4.3 */ + str[i--] = pad; + } } if (i > 0 && str[i] == '.') { /* 10. -> 10 */ -- cgit v1.2.3