replace kFont with std::string

This commit is contained in:
2019-12-01 15:00:10 +01:00
parent 0ee3f1d125
commit 0905827b8d
11 changed files with 38 additions and 46 deletions

View File

@@ -15,8 +15,8 @@ public:
std::string m_text;
std::string m_font = "arial";
glm::vec4 m_color{ 1, 1, 1, 1 };
int m_font_size = 11;
kFont font_id;
int m_font_size = 17;
std::string font_id;
bool m_multiline = false;
glm::vec2 m_off = { 0, 0 };
@@ -32,6 +32,6 @@ public:
void set_text(const std::string& s);
void set_text_format(const char* fmt, ...);
void set_font(kFont fontID);
void set_font(const std::string& fontID);
void update_layout();
};