godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #58010 from jmb462/fix-TextEdit-v_scroll_speed

This commit is contained in:
Rémi Verschelde 2022-04-04 13:50:52 +02:00 committed by GitHub
parent 10d9e47949 0d17903bd5
commit f1592cb3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_settings.cpp
View File

@ -542,7 +542,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
_initial_set("text_editor/behavior/navigation/move_caret_on_right_click", true); _initial_set("text_editor/behavior/navigation/move_caret_on_right_click", true);
_initial_set("text_editor/behavior/navigation/scroll_past_end_of_file", false); _initial_set("text_editor/behavior/navigation/scroll_past_end_of_file", false);
_initial_set("text_editor/behavior/navigation/smooth_scrolling", true); _initial_set("text_editor/behavior/navigation/smooth_scrolling", true);
_initial_set("text_editor/behavior/navigation/v_scroll_speed", 80); EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "text_editor/behavior/navigation/v_scroll_speed", 80, "1,10000,1")
// Behavior: Indent // Behavior: Indent
EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "text_editor/behavior/indent/type", 0, "Tabs,Spaces") EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "text_editor/behavior/indent/type", 0, "Tabs,Spaces")

7
scene/gui/text_edit.cpp
View File

@ -471,6 +471,11 @@ void TextEdit::_notification(int p_what) {
// To ensure minimap is responsive override the speed setting. // To ensure minimap is responsive override the speed setting.
double vel = ((target_y / dist) * ((minimap_clicked) ? 3000 : v_scroll_speed)) * get_physics_process_delta_time(); double vel = ((target_y / dist) * ((minimap_clicked) ? 3000 : v_scroll_speed)) * get_physics_process_delta_time();
// Prevent too small velocity to block scrolling
if (Math::abs(vel) < v_scroll->get_step()) {
vel = v_scroll->get_step() * SIGN(vel);
}
if (Math::abs(vel) >= dist) { if (Math::abs(vel) >= dist) {
set_v_scroll(target_v_scroll); set_v_scroll(target_v_scroll);
scrolling = false; scrolling = false;
@ -4390,6 +4395,8 @@ int TextEdit::get_h_scroll() const {
} }
void TextEdit::set_v_scroll_speed(float p_speed) { void TextEdit::set_v_scroll_speed(float p_speed) {
// Prevent setting a vertical scroll speed value under 1.0
ERR_FAIL_COND(p_speed < 1.0);
v_scroll_speed = p_speed; v_scroll_speed = p_speed;
} }