UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-29 19:49:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[kandinsky] Replace KDText::stringSize(" ") by KDText::charSize()

Browse Source 
Change-Id: Ie962d7784b54ff41431d21f64d9af0887a86f9b7
This commit is contained in:
Émilie Feral
2017-08-09 10:34:46 +02:00
parent cdee87527e
commit 5c4740913b
17 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kandinsky/src/text.cpp
View File

@@ -7,8 +7,12 @@ KDSize KDText::stringSize(const char * text, FontSize size) {
if (text == nullptr) {
return KDSizeZero;
}
if (size == FontSize::Large) {
return KDSize(BITMAP_LargeFont_CHARACTER_WIDTH*strlen(text), BITMAP_LargeFont_CHARACTER_HEIGHT);
}
return KDSize(BITMAP_SmallFont_CHARACTER_WIDTH*strlen(text), BITMAP_SmallFont_CHARACTER_HEIGHT);
KDSize cSize = charSize(size);
return KDSize(cSize.width()*strlen(text), cSize.height());
}
KDSize KDText::charSize(FontSize size) {
if (size == FontSize::Large) {
return KDSize(BITMAP_LargeFont_CHARACTER_WIDTH, BITMAP_LargeFont_CHARACTER_HEIGHT);
}
return KDSize(BITMAP_SmallFont_CHARACTER_WIDTH, BITMAP_SmallFont_CHARACTER_HEIGHT);}