Merge remote-tracking branch 'upstream/main' into spawn_objects

This commit is contained in:
DanielProl1xy
2024-02-21 15:26:17 +03:00
5 changed files with 47 additions and 7 deletions
+9 -1
View File
@@ -361,10 +361,18 @@ std::wstring TextBox::getText() const {
return input;
}
void TextBox::setText(std::wstring value) {
void TextBox::setText(const std::wstring value) {
this->input = value;
}
std::wstring TextBox::getPlaceholder() const {
return placeholder;
}
void TextBox::setPlaceholder(const std::wstring& placeholder) {
this->placeholder = placeholder;
}
// ============================== InputBindBox ================================
InputBindBox::InputBindBox(Binding& binding, glm::vec4 padding)
: Panel(glm::vec2(100,32), padding, 0),
+2
View File
@@ -122,6 +122,8 @@ namespace gui {
virtual std::wstring getText() const;
/* Set TextBox content text */
virtual void setText(std::wstring value);
virtual std::wstring getPlaceholder() const;
virtual void setPlaceholder(const std::wstring&);
virtual bool validate();
virtual void setValid(bool valid);
virtual bool isValid() const;