godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stops scrolling when the user issues another command

This commit is contained in:
Paulb23 2017-08-22 20:02:08 +01:00
parent 294e912a84
commit 24c6c097f3
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scene/gui/scroll_bar.cpp
View File

@ -40,6 +40,11 @@ void ScrollBar::set_can_focus_by_default(bool p_can_focus) {
void ScrollBar::_gui_input(Ref<InputEvent> p_event) { void ScrollBar::_gui_input(Ref<InputEvent> p_event) {
Ref<InputEventMouseMotion> m = p_event;
if (!m.is_valid() || drag.active) {
emit_signal("scrolling");
}
Ref<InputEventMouseButton> b = p_event; Ref<InputEventMouseButton> b = p_event;
if (b.is_valid()) { if (b.is_valid()) {
@ -143,8 +148,6 @@ void ScrollBar::_gui_input(Ref<InputEvent> p_event) {
} }
} }
Ref<InputEventMouseMotion> m = p_event;
if (m.is_valid()) { if (m.is_valid()) {
accept_event(); accept_event();
@ -823,6 +826,8 @@ void ScrollBar::_bind_methods() {
ClassDB::bind_method(D_METHOD("_drag_slave_input"), &ScrollBar::_drag_slave_input); ClassDB::bind_method(D_METHOD("_drag_slave_input"), &ScrollBar::_drag_slave_input);
ClassDB::bind_method(D_METHOD("_drag_slave_exit"), &ScrollBar::_drag_slave_exit); ClassDB::bind_method(D_METHOD("_drag_slave_exit"), &ScrollBar::_drag_slave_exit);
ADD_SIGNAL(MethodInfo("scrolling"));
ADD_PROPERTY(PropertyInfo(Variant::REAL, "custom_step", PROPERTY_HINT_RANGE, "-1,4096"), "set_custom_step", "get_custom_step"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "custom_step", PROPERTY_HINT_RANGE, "-1,4096"), "set_custom_step", "get_custom_step");
} }

13
scene/gui/text_edit.cpp
View File

@ -2880,6 +2880,8 @@ void TextEdit::_post_shift_selection() {
} }
void TextEdit::_scroll_lines_up() { void TextEdit::_scroll_lines_up() {
scrolling = false;
// adjust the vertical scroll // adjust the vertical scroll
if (get_v_scroll() > 0) { if (get_v_scroll() > 0) {
set_v_scroll(get_v_scroll() - 1); set_v_scroll(get_v_scroll() - 1);
@ -2892,6 +2894,8 @@ void TextEdit::_scroll_lines_up() {
} }
void TextEdit::_scroll_lines_down() { void TextEdit::_scroll_lines_down() {
scrolling = false;
// calculate the maximum vertical scroll position // calculate the maximum vertical scroll position
int max_v_scroll = get_line_count() - 1; int max_v_scroll = get_line_count() - 1;
if (!scroll_past_end_of_file_enabled) { if (!scroll_past_end_of_file_enabled) {
@ -3156,6 +3160,7 @@ int TextEdit::get_visible_rows() const {
return total; return total;
} }
void TextEdit::adjust_viewport_to_cursor() { void TextEdit::adjust_viewport_to_cursor() {
scrolling = false;
if (cursor.line_ofs > cursor.line) if (cursor.line_ofs > cursor.line)
cursor.line_ofs = cursor.line; cursor.line_ofs = cursor.line;
@ -3195,6 +3200,7 @@ void TextEdit::adjust_viewport_to_cursor() {
} }
void TextEdit::center_viewport_to_cursor() { void TextEdit::center_viewport_to_cursor() {
scrolling = false;
if (cursor.line_ofs > cursor.line) if (cursor.line_ofs > cursor.line)
cursor.line_ofs = cursor.line; cursor.line_ofs = cursor.line;
@ -3313,6 +3319,10 @@ bool TextEdit::cursor_is_block_mode() const {
return block_caret; return block_caret;
} }
void TextEdit::_v_scroll_input() {
scrolling = false;
}
void TextEdit::_scroll_moved(double p_to_val) { void TextEdit::_scroll_moved(double p_to_val) {
if (updating_scrolls) if (updating_scrolls)
@ -4709,6 +4719,7 @@ void TextEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("_push_current_op"), &TextEdit::_push_current_op); ClassDB::bind_method(D_METHOD("_push_current_op"), &TextEdit::_push_current_op);
ClassDB::bind_method(D_METHOD("_click_selection_held"), &TextEdit::_click_selection_held); ClassDB::bind_method(D_METHOD("_click_selection_held"), &TextEdit::_click_selection_held);
ClassDB::bind_method(D_METHOD("_toggle_draw_caret"), &TextEdit::_toggle_draw_caret); ClassDB::bind_method(D_METHOD("_toggle_draw_caret"), &TextEdit::_toggle_draw_caret);
ClassDB::bind_method(D_METHOD("_v_scroll_input"), &TextEdit::_v_scroll_input);
BIND_ENUM_CONSTANT(SEARCH_MATCH_CASE); BIND_ENUM_CONSTANT(SEARCH_MATCH_CASE);
BIND_ENUM_CONSTANT(SEARCH_WHOLE_WORDS); BIND_ENUM_CONSTANT(SEARCH_WHOLE_WORDS);
@ -4846,6 +4857,8 @@ TextEdit::TextEdit() {
h_scroll->connect("value_changed", this, "_scroll_moved"); h_scroll->connect("value_changed", this, "_scroll_moved");
v_scroll->connect("value_changed", this, "_scroll_moved"); v_scroll->connect("value_changed", this, "_scroll_moved");
v_scroll->connect("scrolling", this, "_v_scroll_input");
cursor_changed_dirty = false; cursor_changed_dirty = false;
text_changed_dirty = false; text_changed_dirty = false;

1
scene/gui/text_edit.h
View File

@ -299,6 +299,7 @@ class TextEdit : public Control {
void adjust_viewport_to_cursor(); void adjust_viewport_to_cursor();
void _scroll_moved(double); void _scroll_moved(double);
void _update_scrollbars(); void _update_scrollbars();
void _v_scroll_input();
void _click_selection_held(); void _click_selection_held();
void _pre_shift_selection(); void _pre_shift_selection();