diff --git a/src/kekengine/include/uielements.h b/src/kekengine/include/uielements.h index f7ea8d2..f86baba 100644 --- a/src/kekengine/include/uielements.h +++ b/src/kekengine/include/uielements.h @@ -58,12 +58,12 @@ class TextElement: public UIElement { class RectangleElement: public UIElement { protected: - UIValue w, h; - unsigned int vao; unsigned int vbo; public: + UIValue w, h; + Color color; RectangleElement(UIValue x, UIValue y, UIValue w, UIValue h); @@ -100,11 +100,6 @@ class TextFieldElement: public RectangleElement { protected: std::string text; - Color color; - Color focusColor; - - TextElement *textElement; - RectangleElement *cursor; KeyboardCapture capture; float lastCharTyped = 0; @@ -113,6 +108,12 @@ class TextFieldElement: public RectangleElement { void updateText(std::u32string newText); public: + Color color; + Color focusColor; + + TextElement *textElement; + RectangleElement *cursor; + TextFieldElement(UIValue x, UIValue y, UIValue w, std::shared_ptr font); TextFieldElement(UIValue x, UIValue y, UIValue w);