mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-11 05:51:51 +00:00
Use textInput state only for TextBox
This commit is contained in:
parent
726f004893
commit
dfd0100d17
4 changed files with 9 additions and 3 deletions
|
|
@ -616,8 +616,15 @@ bool TextBox::isAutoResize() const {
|
||||||
return autoresize;
|
return autoresize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TextBox::defocus() {
|
||||||
|
Container::defocus();
|
||||||
|
gui.getInput().stopTextInput();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void TextBox::onFocus() {
|
void TextBox::onFocus() {
|
||||||
Container::onFocus();
|
Container::onFocus();
|
||||||
|
gui.getInput().startTextInput();
|
||||||
if (onEditStart) {
|
if (onEditStart) {
|
||||||
setCaret(input.size());
|
setCaret(input.size());
|
||||||
onEditStart();
|
onEditStart();
|
||||||
|
|
|
||||||
|
|
@ -230,6 +230,7 @@ namespace gui {
|
||||||
virtual bool isShowLineNumbers() const;
|
virtual bool isShowLineNumbers() const;
|
||||||
|
|
||||||
virtual void reposition() override;
|
virtual void reposition() override;
|
||||||
|
virtual void defocus() override;
|
||||||
virtual void onFocus() override;
|
virtual void onFocus() override;
|
||||||
virtual void refresh() override;
|
virtual void refresh() override;
|
||||||
virtual void doubleClick(int x, int y) override;
|
virtual void doubleClick(int x, int y) override;
|
||||||
|
|
|
||||||
|
|
@ -108,13 +108,11 @@ bool UINode::isPressed() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
void UINode::onFocus() {
|
void UINode::onFocus() {
|
||||||
gui.getInput().startTextInput();
|
|
||||||
focused = true;
|
focused = true;
|
||||||
focusCallbacks.notify(gui);
|
focusCallbacks.notify(gui);
|
||||||
}
|
}
|
||||||
|
|
||||||
void UINode::defocus() {
|
void UINode::defocus() {
|
||||||
gui.getInput().stopTextInput();
|
|
||||||
focused = false;
|
focused = false;
|
||||||
defocusCallbacks.notify(gui);
|
defocusCallbacks.notify(gui);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -192,6 +192,7 @@ namespace gui {
|
||||||
virtual UINode* listenFocus(const onaction& action);
|
virtual UINode* listenFocus(const onaction& action);
|
||||||
virtual UINode* listenDefocus(const onaction& action);
|
virtual UINode* listenDefocus(const onaction& action);
|
||||||
|
|
||||||
|
virtual void defocus();
|
||||||
virtual void onFocus();
|
virtual void onFocus();
|
||||||
virtual void doubleClick(int x, int y);
|
virtual void doubleClick(int x, int y);
|
||||||
virtual void click(int x, int y);
|
virtual void click(int x, int y);
|
||||||
|
|
@ -201,7 +202,6 @@ namespace gui {
|
||||||
virtual void scrolled(int value);
|
virtual void scrolled(int value);
|
||||||
|
|
||||||
bool isPressed() const;
|
bool isPressed() const;
|
||||||
void defocus();
|
|
||||||
bool isFocused() const;
|
bool isFocused() const;
|
||||||
|
|
||||||
/// @brief Check if element catches all user input when focused
|
/// @brief Check if element catches all user input when focused
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue