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

Merge pull request #39717 from hinlopen/empty-scroll-eats-input 

No longer scroll vertically when scrollbars are unavailable
This commit is contained in:
Rémi Verschelde 2020-06-21 18:32:38 +02:00 committed by GitHub
parent 858af3d3b9 5f7499beac
commit 81a47d033d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scene/gui/text_edit.cpp
View File

@ -366,26 +366,9 @@ void TextEdit::_update_scrollbars() {
total_width += cache.minimap_width; total_width += cache.minimap_width;
} }
bool use_hscroll = true;
bool use_vscroll = true;
// Thanks yessopie for this clever bit of logic.
if (total_rows <= visible_rows && total_width <= visible_width) {
use_hscroll = false;
use_vscroll = false;
} else {
if (total_rows > visible_rows && total_width <= visible_width) {
use_hscroll = false;
}
if (total_rows <= visible_rows && total_width > visible_width) {
use_vscroll = false;
}
}
updating_scrolls = true; updating_scrolls = true;
if (use_vscroll) { if (total_rows > visible_rows) {
v_scroll->show(); v_scroll->show();
v_scroll->set_max(total_rows + get_visible_rows_offset()); v_scroll->set_max(total_rows + get_visible_rows_offset());
v_scroll->set_page(visible_rows + get_visible_rows_offset()); v_scroll->set_page(visible_rows + get_visible_rows_offset());
@ -403,7 +386,7 @@ void TextEdit::_update_scrollbars() {
v_scroll->hide(); v_scroll->hide();
} }
if (use_hscroll && !is_wrap_enabled()) { if (total_width > visible_width && !is_wrap_enabled()) {
h_scroll->show(); h_scroll->show();
h_scroll->set_max(total_width); h_scroll->set_max(total_width);
h_scroll->set_page(visible_width); h_scroll->set_page(visible_width);
@ -2274,14 +2257,14 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
if (mb->get_button_index() == BUTTON_WHEEL_UP && !mb->get_command()) { if (mb->get_button_index() == BUTTON_WHEEL_UP && !mb->get_command()) {
if (mb->get_shift()) { if (mb->get_shift()) {
h_scroll->set_value(h_scroll->get_value() - (100 * mb->get_factor())); h_scroll->set_value(h_scroll->get_value() - (100 * mb->get_factor()));
} else { } else if (v_scroll->is_visible()) {
_scroll_up(3 * mb->get_factor()); _scroll_up(3 * mb->get_factor());
} }
} }
if (mb->get_button_index() == BUTTON_WHEEL_DOWN && !mb->get_command()) { if (mb->get_button_index() == BUTTON_WHEEL_DOWN && !mb->get_command()) {
if (mb->get_shift()) { if (mb->get_shift()) {
h_scroll->set_value(h_scroll->get_value() + (100 * mb->get_factor())); h_scroll->set_value(h_scroll->get_value() + (100 * mb->get_factor()));
} else { } else if (v_scroll->is_visible()) {
_scroll_down(3 * mb->get_factor()); _scroll_down(3 * mb->get_factor());
} }
} }