The-Homebrew-Cloud
/
libgui
mirror of https://github.com/wiiu-env/libgui.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Store the font size only once in GuiText

This commit is contained in:
Maschell 2020-08-13 13:41:03 +02:00
parent 427b511cb0
commit 0e83927d4d
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gui/GuiText.h
View File

@ -103,14 +103,14 @@ public:
return maxWidth;
}
//!Get fontsize
void setSSAA(int32_t ssaa) {
this->internalSSAA = ssaa;
};
//!Get fontsize
int32_t getFontSize() {
return size;
return currentSize;
};
//!Set max lines to draw

14
source/gui/GuiText.cpp
View File

@ -37,8 +37,7 @@ GX2ColorF32 GuiText::presetColor = (GX2ColorF32) {
GuiText::GuiText() {
text = NULL;
size = presetSize;
currentSize = size;
currentSize = presetSize;
color = glm::vec4(presetColor.r, presetColor.g, presetColor.b, presetColor.a);
alpha = presetColor.a;
alignment = presetAlignment;
@ -58,8 +57,7 @@ GuiText::GuiText() {
GuiText::GuiText(const char *t, int32_t s, const glm::vec4 &c) {
text = NULL;
size = s;
currentSize = size;
currentSize = s;
color = c;
alpha = c[3];
alignment = ALIGN_CENTER | ALIGN_MIDDLE;
@ -86,8 +84,7 @@ GuiText::GuiText(const char *t, int32_t s, const glm::vec4 &c) {
GuiText::GuiText(const wchar_t *t, int32_t s, const glm::vec4 &c) {
text = NULL;
size = s;
currentSize = size;
currentSize = s;
color = c;
alpha = c[3];
alignment = ALIGN_CENTER | ALIGN_MIDDLE;
@ -119,8 +116,7 @@ GuiText::GuiText(const wchar_t *t, int32_t s, const glm::vec4 &c) {
*/
GuiText::GuiText(const char *t) {
text = NULL;
size = presetSize;
currentSize = size;
currentSize = presetSize;
color = glm::vec4(presetColor.r, presetColor.g, presetColor.b, presetColor.a);
alpha = presetColor.a;
alignment = presetAlignment;
@ -243,7 +239,7 @@ void GuiText::setPresetFont(FreeTypeGX *f) {
}
void GuiText::setFontSize(int32_t s) {
size = s;
currentSize = s;
}
void GuiText::setMaxWidth(int32_t width, int32_t w) {