UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher/run_loop] Move kandinksy include

Browse Source 
To check whether an ExternalText could be written with Epsilon's fonts,
UTF8Helper made a reference to Kandinsky, which is prohibited. This
check is now done in Escher, before dispatching the event.

Change-Id: I55e9db1ba43c3115775499db47b90a6bdd7cc7b3
This commit is contained in:
Gabriel Ozouf
2020-10-27 14:40:18 +01:00
committed by Émilie Feral
parent d5e810f2b8
commit 0185e0562c
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kandinsky/include/kandinsky/font.h
View File

@@ -33,6 +33,8 @@ public:
static constexpr const KDFont * LargeFont = &privateLargeFont;
static constexpr const KDFont * SmallFont = &privateSmallFont;
static bool CanBeWrittenWithGlyphs(const char * text);
KDSize stringSize(const char * text, int textLength = -1) const {
return stringSizeUntil(text, textLength < 0 ? nullptr : text + textLength);
}

14
kandinsky/src/font.cpp
View File

@@ -159,3 +159,17 @@ KDFont::GlyphIndex KDFont::indexForCodePoint(CodePoint c) const {
return IndexForReplacementCharacterCodePoint;
#endif
}
bool KDFont::CanBeWrittenWithGlyphs(const char * text) {
UTF8Decoder decoder(text);
CodePoint cp = decoder.nextCodePoint();
while(cp != UCodePointNull) {
if (LargeFont->indexForCodePoint(cp) == KDFont::IndexForReplacementCharacterCodePoint
|| SmallFont->indexForCodePoint(cp) == KDFont::IndexForReplacementCharacterCodePoint)
{
return false;
}
cp = decoder.nextCodePoint();
}
return true;
}