maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge a70834e5fd into 171a69757f

Browse source
This commit is contained in:
ConteZero 2021-11-11 04:31:19 -04:00 committed by GitHub
parent 171a69757f a70834e5fd
commit fe16bd32b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 94 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/classes/Control.xml
View file

@ -1154,6 +1154,12 @@
<constant name="NOTIFICATION_LAYOUT_DIRECTION_CHANGED" value="49">
Sent when control layout direction is changed.
</constant>
<constant name="NOTIFICATION_DROP_DATA_SUCCESS" value="500">
Sent when drop data operation is successful.
</constant>
<constant name="NOTIFICATION_DROP_DATA_FAIL" value="501">
Sent when drop data operation fails.
</constant>
<constant name="CURSOR_ARROW" value="0" enum="CursorShape">
Show the system's arrow mouse cursor when the user hovers the node. Use with [member mouse_default_cursor_shape].
</constant>

2
scene/gui/control.cpp
View file

@ -3046,6 +3046,8 @@ void Control::_bind_methods() {
BIND_CONSTANT(NOTIFICATION_SCROLL_BEGIN);
BIND_CONSTANT(NOTIFICATION_SCROLL_END);
BIND_CONSTANT(NOTIFICATION_LAYOUT_DIRECTION_CHANGED);
BIND_CONSTANT(NOTIFICATION_DROP_DATA_SUCCESS);
BIND_CONSTANT(NOTIFICATION_DROP_DATA_FAIL);
BIND_ENUM_CONSTANT(CURSOR_ARROW);
BIND_ENUM_CONSTANT(CURSOR_IBEAM);

2
scene/gui/control.h
View file

@ -315,6 +315,8 @@ public:
NOTIFICATION_SCROLL_BEGIN = 47,
NOTIFICATION_SCROLL_END = 48,
NOTIFICATION_LAYOUT_DIRECTION_CHANGED = 49,
NOTIFICATION_DROP_DATA_SUCCESS = 500,
NOTIFICATION_DROP_DATA_FAIL = 501,
};

79
scene/gui/line_edit.cpp
View file

@ -268,7 +268,9 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
return;
}
shift_selection_check_pre(b->is_shift_pressed());
if (b->is_shift_pressed()) {
shift_selection_check_pre(true);
}
set_caret_at_pixel_pos(b->get_position().x);
@ -369,6 +371,11 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
selection_fill_at_caret();
}
}
if (drag_action && can_drop_data(m->get_position(), get_viewport()->gui_get_drag_data())) {
drag_caret_force_displayed = true;
set_caret_at_pixel_pos(m->get_position().x);
}
}
Ref<InputEventKey> k = p_event;
@ -569,22 +576,44 @@ bool LineEdit::can_drop_data(const Point2 &p_point, const Variant &p_data) const
return drop_override;
}
return p_data.get_type() == Variant::STRING;
return is_editable() && p_data.get_type() == Variant::STRING;
}
void LineEdit::drop_data(const Point2 &p_point, const Variant &p_data) {
Control::drop_data(p_point, p_data);
if (p_data.get_type() == Variant::STRING) {
if (p_data.get_type() == Variant::STRING && is_editable()) {
set_caret_at_pixel_pos(p_point.x);
int selected = selection.end - selection.begin;
int caret_column_tmp = caret_column;
if (selection.drag_attempt) {
selection.drag_attempt = false;
if (caret_column < selection.begin || caret_column > selection.end) {
if (caret_column_tmp > selection.end) {
caret_column_tmp = caret_column_tmp - (selection.end - selection.begin);
}
selection_delete();
text.erase(selection.begin, selected);
_shape();
insert_text_at_caret(p_data);
selection.begin = caret_column - selected;
selection.end = caret_column;
set_caret_column(caret_column_tmp);
insert_text_at_caret(p_data);
}
} else if (selection.enabled && caret_column >= selection.begin && caret_column <= selection.end) {
caret_column_tmp = selection.begin;
selection_delete();
set_caret_column(caret_column_tmp);
insert_text_at_caret(p_data);
grab_focus();
} else {
insert_text_at_caret(p_data);
grab_focus();
}
select(caret_column_tmp, caret_column);
if (!text_changed_dirty) {
if (is_inside_tree()) {
MessageQueue::get_singleton()->push_call(this, "_text_changed");
}
text_changed_dirty = true;
}
update();
}
}
@ -804,7 +833,7 @@ void LineEdit::_notification(int p_what) {
// Draw carets.
ofs.x = x_ofs + scroll_offset;
if (draw_caret) {
if (draw_caret || drag_caret_force_displayed) {
if (ime_text.length() == 0) {
// Normal caret.
CaretInfo caret = TS->shaped_text_get_carets(text_rid, caret_column);
@ -922,7 +951,7 @@ void LineEdit::_notification(int p_what) {
DisplayServer::get_singleton()->virtual_keyboard_hide();
}
if (deselect_on_focus_loss_enabled) {
if (deselect_on_focus_loss_enabled && !selection.drag_attempt) {
deselect();
}
} break;
@ -936,6 +965,26 @@ void LineEdit::_notification(int p_what) {
update();
}
} break;
case Control::NOTIFICATION_DRAG_BEGIN: {
drag_action = true;
} break;
case Control::NOTIFICATION_DRAG_END: {
drag_action = false;
drag_caret_force_displayed = false;
} break;
case Control::NOTIFICATION_DROP_DATA_SUCCESS: {
if (selection.drag_attempt) {
selection.drag_attempt = false;
if (is_editable()) {
selection_delete();
} else if (deselect_on_focus_loss_enabled) {
deselect();
}
}
} break;
case Control::NOTIFICATION_DROP_DATA_FAIL: {
selection.drag_attempt = false;
} break;
}
}
@ -1000,6 +1049,9 @@ void LineEdit::undo() {
} else if (undo_stack_pos == undo_stack.front()) {
return;
}
deselect();
undo_stack_pos = undo_stack_pos->prev();
TextOperation op = undo_stack_pos->get();
text = op.text;
@ -1021,6 +1073,9 @@ void LineEdit::redo() {
if (undo_stack_pos == undo_stack.back()) {
return;
}
deselect();
undo_stack_pos = undo_stack_pos->next();
TextOperation op = undo_stack_pos->get();
text = op.text;

3
scene/gui/line_edit.h
View file

@ -129,6 +129,9 @@ private:
bool middle_mouse_paste_enabled = true;
bool drag_action = false;
bool drag_caret_force_displayed = false;
Ref<Texture2D> right_icon;
bool flat = false;

16
scene/main/viewport.cpp
View file

@ -1515,8 +1515,9 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
if (gui.drag_data.get_type() != Variant::NIL && mb->get_button_index() == MOUSE_BUTTON_LEFT) {
// Alternate drop use (when using force_drag(), as proposed by #5342).
bool drop_result = false;
if (gui.mouse_focus) {
_gui_drop(gui.mouse_focus, pos, false);
drop_result = _gui_drop(gui.mouse_focus, pos, false);
}
gui.drag_data = Variant();
@ -1527,6 +1528,11 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
memdelete(drag_preview);
gui.drag_preview_id = ObjectID();
}
if (drop_result) {
_propagate_viewport_notification(this, Control::NOTIFICATION_DROP_DATA_SUCCESS);
} else {
_propagate_viewport_notification(this, Control::NOTIFICATION_DROP_DATA_FAIL);
}
_propagate_viewport_notification(this, NOTIFICATION_DRAG_END);
// Change mouse accordingly.
}
@ -1534,8 +1540,9 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
_gui_cancel_tooltip();
} else {
if (gui.drag_data.get_type() != Variant::NIL && mb->get_button_index() == MOUSE_BUTTON_LEFT) {
bool drop_result = false;
if (gui.drag_mouse_over) {
_gui_drop(gui.drag_mouse_over, gui.drag_mouse_over_pos, false);
drop_result = _gui_drop(gui.drag_mouse_over, gui.drag_mouse_over_pos, false);
}
Control *drag_preview = _gui_get_drag_preview();
@ -1547,6 +1554,11 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
gui.drag_data = Variant();
gui.dragging = false;
gui.drag_mouse_over = nullptr;
if (drop_result) {
_propagate_viewport_notification(this, Control::NOTIFICATION_DROP_DATA_SUCCESS);
} else {
_propagate_viewport_notification(this, Control::NOTIFICATION_DROP_DATA_FAIL);
}
_propagate_viewport_notification(this, NOTIFICATION_DRAG_END);
// Change mouse accordingly.
}