UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[kandinsky] KDContext::drawString can take a max length

Browse Source 
Change-Id: I59cf0c1fbfb2288ab54905a4fd2558885c279814
This commit is contained in:
Romain Goyet
2017-08-03 23:26:29 +02:00
parent 5a4fc8af5d
commit cbc78460ac
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ public:
// Text
void drawChar(char character, KDPoint p, KDText::FontSize size = KDText::FontSize::Large, KDColor textColor = KDColorBlack, KDColor backgroundColor = KDColorWhite);
void drawString(const char * text, KDPoint p, KDText::FontSize size = KDText::FontSize::Large, KDColor textColor = KDColorBlack, KDColor backgroundColor = KDColorWhite);
void drawString(const char * text, KDPoint p, KDText::FontSize size = KDText::FontSize::Large, KDColor textColor = KDColorBlack, KDColor backgroundColor = KDColorWhite, int maxLength = -1);
void blendChar(char character, KDPoint p, KDText::FontSize size, KDColor textColor = KDColorBlack);
void blendString(const char * text, KDPoint p, KDText::FontSize size, KDColor textColor = KDColorBlack);

6
kandinsky/src/context_text.cpp
View File

@@ -27,11 +27,13 @@ void KDContext::drawChar(char character, KDPoint p, KDText::FontSize size, KDCol
characterBuffer);
}
void KDContext::drawString(const char * text, KDPoint p, KDText::FontSize size, KDColor textColor, KDColor backgroundColor) {
void KDContext::drawString(const char * text, KDPoint p, KDText::FontSize size, KDColor textColor, KDColor backgroundColor, int maxLength) {
KDPoint position = p;
int characterWidth = size == KDText::FontSize::Large ? BITMAP_LargeFont_CHARACTER_WIDTH : BITMAP_SmallFont_CHARACTER_WIDTH;
KDPoint characterSize(characterWidth, 0);
while(*text != 0) {
const char * end = text+maxLength;
while(*text != 0 && text != end) {
drawChar(*text, position, size, textColor, backgroundColor);
text++;
position = position.translatedBy(characterSize);