From 8fddcf7507f750b1b1a47d01167ccad22c40e1ff Mon Sep 17 00:00:00 2001 From: hyzboy Date: Mon, 28 Feb 2022 14:28:01 +0800 Subject: [PATCH] renamed to FULL_WIDTH_SPACE from FULL_SPACE --- CMCore | 2 +- src/SceneGraph/font/FontSource.cpp | 2 +- src/SceneGraph/font/TextLayout.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMCore b/CMCore index c2ac03c3..090fab9c 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit c2ac03c35bc545ae529cd54569c7557dc338fd67 +Subproject commit 090fab9c0eca5fa157f1f3280713fd42954a21a2 diff --git a/src/SceneGraph/font/FontSource.cpp b/src/SceneGraph/font/FontSource.cpp index 74b7b022..c11063ab 100644 --- a/src/SceneGraph/font/FontSource.cpp +++ b/src/SceneGraph/font/FontSource.cpp @@ -34,7 +34,7 @@ namespace hgl MapObject all_char_attrs; }//namespace - + const CLA *FontSource::GetCLA(const u32char &ch) { CLA *cla; diff --git a/src/SceneGraph/font/TextLayout.cpp b/src/SceneGraph/font/TextLayout.cpp index bc822bdb..89447539 100644 --- a/src/SceneGraph/font/TextLayout.cpp +++ b/src/SceneGraph/font/TextLayout.cpp @@ -212,7 +212,7 @@ namespace hgl if((*cda)->cla->attr->ch==' ') left+=space_size; else - if((*cda)->cla->attr->ch==U32_FULL_SPACE) + if((*cda)->cla->attr->ch==U32_FULL_WIDTH_SPACE) left+=full_space_size; else if((*cda)->cla->attr->ch=='\t')