Fixed GUI textbox moving cursor on layout

This commit is contained in:
Yousef Khadadeh 2026-04-04 22:28:33 +03:00
parent 550c31f088
commit 7286f01035
4 changed files with 11 additions and 7 deletions

View file

@ -303,8 +303,6 @@ void TextBoxEditTool::right_click_popup_gui(Vector2f popupPos) {
} }
}); });
}); });
} }
void TextBoxEditTool::hold_undo_data(const std::string& undoName, TextBoxCanvasComponent& a) { void TextBoxEditTool::hold_undo_data(const std::string& undoName, TextBoxCanvasComponent& a) {

View file

@ -52,6 +52,7 @@ template <typename T> class TextBox : public Element {
bool update_data(); bool update_data();
bool is_selected() const; bool is_selected() const;
bool isHeld = false;
std::optional<TextEditData> edit; std::optional<TextEditData> edit;
std::optional<T> oldData; std::optional<T> oldData;

View file

@ -106,6 +106,8 @@ template <typename T> void TextBox<T>::input_text_callback(const InputManager::T
template <typename T> void TextBox<T>::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) { template <typename T> void TextBox<T>::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
auto& io = gui.io; auto& io = gui.io;
isHeld = false;
if(button.button == InputManager::MouseButton::LEFT && boundingBox.has_value()) { if(button.button == InputManager::MouseButton::LEFT && boundingBox.has_value()) {
if(button.down) { if(button.down) {
if(mouseHovering) { if(mouseHovering) {
@ -117,7 +119,8 @@ template <typename T> void TextBox<T>::input_mouse_button_callback(const InputMa
if(userInfo.onSelect) userInfo.onSelect(); if(userInfo.onSelect) userInfo.onSelect();
}); });
} }
textbox->process_mouse_left_button(*cur, button.pos - boundingBox.value().min, button.clicks, true, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held); isHeld = true;
textbox->process_mouse_left_button(*cur, button.pos - boundingBox.value().min, button.clicks, isHeld, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held);
} }
else if(is_selected()) { else if(is_selected()) {
gui.io.input->remove_text_box(edit.value().textboxInputID); gui.io.input->remove_text_box(edit.value().textboxInputID);
@ -131,14 +134,14 @@ template <typename T> void TextBox<T>::input_mouse_button_callback(const InputMa
} }
} }
else { else {
textbox->process_mouse_left_button(*cur, button.pos - boundingBox.value().min, 0, false, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held); textbox->process_mouse_left_button(*cur, button.pos - boundingBox.value().min, 0, isHeld, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held);
} }
} }
} }
template <typename T> void TextBox<T>::input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) { template <typename T> void TextBox<T>::input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) {
if(boundingBox.has_value()) if(boundingBox.has_value())
textbox->process_mouse_left_button(*cur, motion.pos - boundingBox.value().min, 0, gui.io.input->mouse.leftDown, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held); textbox->process_mouse_left_button(*cur, motion.pos - boundingBox.value().min, 0, isHeld, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held);
} }
template <typename T> void TextBox<T>::init_textbox(UpdateInputData& io) { template <typename T> void TextBox<T>::init_textbox(UpdateInputData& io) {
@ -153,7 +156,9 @@ template <typename T> void TextBox<T>::init_textbox(UpdateInputData& io) {
template <typename T> void TextBox<T>::reset_textbox_text() { template <typename T> void TextBox<T>::reset_textbox_text() {
textbox->set_string(userInfo.toStr(*userInfo.data)); textbox->set_string(userInfo.toStr(*userInfo.data));
cur->pos = cur->selectionBeginPos = cur->selectionEndPos = {0, 0}; cur->pos = textbox->move(RichText::TextBox::Movement::NOWHERE, cur->pos);
cur->selectionBeginPos = textbox->move(RichText::TextBox::Movement::NOWHERE, cur->selectionBeginPos);
cur->selectionEndPos = textbox->move(RichText::TextBox::Movement::NOWHERE, cur->selectionEndPos);
} }
template <typename T> bool TextBox<T>::update_data() { template <typename T> bool TextBox<T>::update_data() {

View file

@ -43,7 +43,7 @@ class GlobalConfig {
NONE, NONE,
SKIA, SKIA,
DYNAMIC_MSAA DYNAMIC_MSAA
} antialiasing = AntiAliasing::DYNAMIC_MSAA; } antialiasing = AntiAliasing::SKIA;
std::string displayName; std::string displayName;
bool flipZoomToolDirection = false; bool flipZoomToolDirection = false;