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

Merge pull request #4462 from Paulb23/scroll_lines 

Added scroll lines, issue #4243
This commit is contained in:
Rémi Verschelde 2016-04-28 20:53:41 +02:00
parent 0485c9eaba 54244e0e1d
commit 45ffc053b5
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
scene/gui/text_edit.cpp
View File

@ -2057,7 +2057,17 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
scancode_handled=false;
break;
}
#ifdef APPLE_STYLE_KEYS
#ifndef APPLE_STYLE_KEYS
if (k.mod.command) {
_scroll_lines_up();
break;
}
#else
if (k.mod.command && k.mod.alt) {
_scroll_lines_up();
break;
}
if (k.mod.command)
cursor_set_line(0);
else
@ -2084,7 +2094,17 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
scancode_handled=false;
break;
}
#ifdef APPLE_STYLE_KEYS
#ifndef APPLE_STYLE_KEYS
if (k.mod.command) {
_scroll_lines_down();
break;
}
#else
if (k.mod.command && k.mod.alt) {
_scroll_lines_down();
break;
}
if (k.mod.command)
cursor_set_line(text.size()-1);
else
@ -2498,6 +2518,36 @@ void TextEdit::_post_shift_selection() {
selection.selecting_text=true;
}
void TextEdit::_scroll_lines_up() {
// adjust the vertical scroll
if (get_v_scroll() > 0) {
set_v_scroll(get_v_scroll() - 1);
}
// adjust the cursor
if (cursor_get_line() >= (get_visible_rows() + get_v_scroll()) && !selection.active) {
cursor_set_line((get_visible_rows() + get_v_scroll()) - 1, false);
}
}
void TextEdit::_scroll_lines_down() {
// calculate the maximum vertical scroll position
int max_v_scroll = get_line_count() - 1;
if (!scroll_past_end_of_file_enabled) {
max_v_scroll -= get_visible_rows() - 1;
}
// adjust the vertical scroll
if (get_v_scroll() < max_v_scroll) {
set_v_scroll(get_v_scroll() + 1);
}
// adjust the cursor
if ((cursor_get_line()) <= get_v_scroll() - 1 && !selection.active) {
cursor_set_line(get_v_scroll(), false);
}
}
/**** TEXT EDIT CORE API ****/
void TextEdit::_base_insert_text(int p_line, int p_char,const String& p_text,int &r_end_line,int &r_end_column) {

3
scene/gui/text_edit.h
View File

@ -259,6 +259,9 @@ class TextEdit : public Control {
void _pre_shift_selection();
void _post_shift_selection();
void _scroll_lines_up();
void _scroll_lines_down();
// void mouse_motion(const Point& p_pos, const Point& p_rel, int p_button_mask);
Size2 get_minimum_size();