asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #44288 from Chaosus/fix_textedit_scrolling

Browse source 
Fixed mouse scrolling in TextEdit's
This commit is contained in:
Rémi Verschelde 2020-12-12 09:31:33 +01:00 committed by GitHub
commit 8c045fc9ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/gui/text_edit.cpp
View file

@ -1650,7 +1650,7 @@ void TextEdit::_notification(int p_what) {
if (get_viewport()->get_window_id() != DisplayServer::INVALID_WINDOW_ID) {
DisplayServer::get_singleton()->window_set_ime_active(true, get_viewport()->get_window_id());
DisplayServer::get_singleton()->window_set_ime_position(get_global_position() + _get_cursor_pixel_pos(), get_viewport()->get_window_id());
DisplayServer::get_singleton()->window_set_ime_position(get_global_position() + _get_cursor_pixel_pos(false), get_viewport()->get_window_id());
}
if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
@ -2072,8 +2072,10 @@ void TextEdit::_get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) co
r_col = col;
}
Vector2i TextEdit::_get_cursor_pixel_pos() {
adjust_viewport_to_cursor();
Vector2i TextEdit::_get_cursor_pixel_pos(bool p_adjust_viewport) {
if (p_adjust_viewport) {
adjust_viewport_to_cursor();
}
int row = 1;
for (int i = get_first_visible_line(); i < cursor.line; i++) {
if (!is_line_hidden(i)) {

2
scene/gui/text_edit.h
View file

@ -700,7 +700,7 @@ public:
int cursor_get_column() const;
int cursor_get_line() const;
Vector2i _get_cursor_pixel_pos();
Vector2i _get_cursor_pixel_pos(bool p_adjust_viewport = true);
bool cursor_get_blink_enabled() const;
void cursor_set_blink_enabled(const bool p_enabled);