UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-23 15:50:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[kandinsky] Move to KDFont

Browse Source
This commit is contained in:
Romain Goyet
2018-10-09 16:41:24 +02:00
committed by LeaNumworks
parent 29882768bd
commit f8beae3b86
149 changed files with 564 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
escher/src/pointer_text_view.cpp
View File

@@ -1,9 +1,9 @@
#include <escher/pointer_text_view.h>
#include <assert.h>
PointerTextView::PointerTextView(KDText::FontSize size, const char * text, float horizontalAlignment, float verticalAlignment,
PointerTextView::PointerTextView(const KDFont * font, const char * text, float horizontalAlignment, float verticalAlignment,
KDColor textColor, KDColor backgroundColor) :
TextView(size, horizontalAlignment, verticalAlignment, textColor, backgroundColor),
TextView(font, horizontalAlignment, verticalAlignment, textColor, backgroundColor),
m_text(text)
{
}
@@ -16,5 +16,5 @@ void PointerTextView::setText(const char * text) {
}
KDSize PointerTextView::minimalSizeForOptimalDisplay() const {
return KDText::stringSize(text(), m_fontSize);
return m_font->stringSize(text());
}