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

Merge pull request #15127 from poke1024/smooth-scroll-play 

Remove some lagginess from TextEdit's smooth scrolling
This commit is contained in:
Rémi Verschelde 2018-01-03 11:34:42 +01:00 committed by GitHub
parent fd5f193da5 d640542f6d
commit e3c744f9f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scene/gui/text_edit.cpp
View File

@ -3139,6 +3139,9 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
void TextEdit::_scroll_up(real_t p_delta) {
if (scrolling && smooth_scroll_enabled && SGN(target_v_scroll - v_scroll->get_value()) != SGN(-p_delta))
scrolling = false;
if (scrolling) {
target_v_scroll = (target_v_scroll - p_delta);
} else {
@ -3149,8 +3152,12 @@ void TextEdit::_scroll_up(real_t p_delta) {
if (target_v_scroll <= 0) {
target_v_scroll = 0;
}
scrolling = true;
set_physics_process(true);
if (Math::abs(target_v_scroll - v_scroll->get_value()) < 1.0) {
v_scroll->set_value(target_v_scroll);
} else {
scrolling = true;
set_physics_process(true);
}
} else {
v_scroll->set_value(target_v_scroll);
}
@ -3158,6 +3165,9 @@ void TextEdit::_scroll_up(real_t p_delta) {
void TextEdit::_scroll_down(real_t p_delta) {
if (scrolling && smooth_scroll_enabled && SGN(target_v_scroll - v_scroll->get_value()) != SGN(p_delta))
scrolling = false;
if (scrolling) {
target_v_scroll = (target_v_scroll + p_delta);
} else {
@ -3174,8 +3184,13 @@ void TextEdit::_scroll_down(real_t p_delta) {
if (target_v_scroll > max_v_scroll) {
target_v_scroll = max_v_scroll;
}
scrolling = true;
set_physics_process(true);
if (Math::abs(target_v_scroll - v_scroll->get_value()) < 1.0) {
v_scroll->set_value(target_v_scroll);
} else {
scrolling = true;
set_physics_process(true);
}
} else {
v_scroll->set_value(target_v_scroll);
}