[Bf-blender-cvs] [63d5b974ccf] master: UI: Ellipsis Character for Line Continuation

Harley Acheson noreply at git.blender.org
Sat Feb 1 17:36:30 CET 2020


Commit: 63d5b974ccfa0858ad3f8c530cdcdcfb14b7b457
Author: Harley Acheson
Date:   Sat Feb 1 08:35:08 2020 -0800
Branches: master
https://developer.blender.org/rB63d5b974ccfa0858ad3f8c530cdcdcfb14b7b457

UI: Ellipsis Character for Line Continuation

Using ellipsis character for line continuation since that glpyh is now narrower.

Differential Revision: https://developer.blender.org/D6728

Reviewed by Brecht Van Lommel

===================================================================

M	release/scripts/addons
M	source/blender/editors/interface/interface_widgets.c
M	source/tools

===================================================================

diff --git a/release/scripts/addons b/release/scripts/addons
index 21dee6f8943..ad6928706de 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 21dee6f89433249dba6573bf1eaa56a8d5b99c34
+Subproject commit ad6928706de2fa8f44fa35a275453c716d65e773
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index fd2f652d40e..92032c3b18c 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1742,9 +1742,8 @@ float UI_text_clip_middle_ex(const uiFontStyle *fstyle,
   strwidth = BLF_width(fstyle->uifont_id, str, max_len);
 
   if ((okwidth > 0.0f) && (strwidth > okwidth)) {
-    /* utf8 two-dots leader '..' (shorter than ellipsis '...'),
-     * some compilers complain with real literal string. */
-    const char sep[] = {0xe2, 0x80, 0xA5, 0x0};
+    /* Ellipsis. Some compilers complain with real literal string. */
+    const char sep[] = {0xe2, 0x80, 0xA6, 0x0};
     const int sep_len = sizeof(sep) - 1;
     const float sep_strwidth = BLF_width(fstyle->uifont_id, sep, sep_len + 1);
     float parts_strwidth;
diff --git a/source/tools b/source/tools
index ce943dad8a2..603f076606f 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit ce943dad8a21b4784e2dcef12d8f893473cddb7f
+Subproject commit 603f076606f052adc97d937633bfeb9b268ec202



More information about the Bf-blender-cvs mailing list