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

Merge pull request #31302 from Paulb23/issue_4881_code_minimap

Browse source 
Add minimap to text_edit
This commit is contained in:
Rémi Verschelde 2019-08-22 13:15:43 +02:00 committed by GitHub
commit 7978e9071b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 393 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/code_editor.cpp
View file

@ -908,6 +908,8 @@ void CodeTextEditor::update_editor_settings() {
text_editor->set_hiding_enabled(EditorSettings::get_singleton()->get("text_editor/line_numbers/code_folding")); text_editor->set_hiding_enabled(EditorSettings::get_singleton()->get("text_editor/line_numbers/code_folding"));
text_editor->set_draw_fold_gutter(EditorSettings::get_singleton()->get("text_editor/line_numbers/code_folding")); text_editor->set_draw_fold_gutter(EditorSettings::get_singleton()->get("text_editor/line_numbers/code_folding"));
text_editor->set_wrap_enabled(EditorSettings::get_singleton()->get("text_editor/line_numbers/word_wrap")); text_editor->set_wrap_enabled(EditorSettings::get_singleton()->get("text_editor/line_numbers/word_wrap"));
text_editor->set_draw_minimap(EditorSettings::get_singleton()->get("text_editor/line_numbers/draw_minimap"));
text_editor->set_minimap_width(EditorSettings::get_singleton()->get("text_editor/line_numbers/minimap_width"));
text_editor->set_draw_info_gutter(EditorSettings::get_singleton()->get("text_editor/line_numbers/show_info_gutter")); text_editor->set_draw_info_gutter(EditorSettings::get_singleton()->get("text_editor/line_numbers/show_info_gutter"));
text_editor->cursor_set_block_mode(EditorSettings::get_singleton()->get("text_editor/cursor/block_caret")); text_editor->cursor_set_block_mode(EditorSettings::get_singleton()->get("text_editor/cursor/block_caret"));
text_editor->set_smooth_scroll_enabled(EditorSettings::get_singleton()->get("text_editor/open_scripts/smooth_scrolling")); text_editor->set_smooth_scroll_enabled(EditorSettings::get_singleton()->get("text_editor/open_scripts/smooth_scrolling"));

3
editor/editor_settings.cpp
View file

@ -448,6 +448,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
_initial_set("text_editor/line_numbers/show_info_gutter", true); _initial_set("text_editor/line_numbers/show_info_gutter", true);
_initial_set("text_editor/line_numbers/code_folding", true); _initial_set("text_editor/line_numbers/code_folding", true);
_initial_set("text_editor/line_numbers/word_wrap", false); _initial_set("text_editor/line_numbers/word_wrap", false);
_initial_set("text_editor/line_numbers/draw_minimap", false);
_initial_set("text_editor/line_numbers/minimap_width", 80);
hints["text_editor/line_numbers/minimap_width"] = PropertyInfo(Variant::INT, "text_editor/line_numbers/minimap_width", PROPERTY_HINT_RANGE, "50,250,1");
_initial_set("text_editor/line_numbers/show_line_length_guideline", false); _initial_set("text_editor/line_numbers/show_line_length_guideline", false);
_initial_set("text_editor/line_numbers/line_length_guideline_column", 80); _initial_set("text_editor/line_numbers/line_length_guideline_column", 80);
hints["text_editor/line_numbers/line_length_guideline_column"] = PropertyInfo(Variant::INT, "text_editor/line_numbers/line_length_guideline_column", PROPERTY_HINT_RANGE, "20, 160, 1"); hints["text_editor/line_numbers/line_length_guideline_column"] = PropertyInfo(Variant::INT, "text_editor/line_numbers/line_length_guideline_column", PROPERTY_HINT_RANGE, "20, 160, 1");

394
scene/gui/text_edit.cpp
View file

@ -367,6 +367,10 @@ void TextEdit::_update_scrollbars() {
total_width += cache.fold_gutter_width; total_width += cache.fold_gutter_width;
} }
if (draw_minimap) {
total_width += cache.minimap_width;
}
bool use_hscroll = true; bool use_hscroll = true;
bool use_vscroll = true; bool use_vscroll = true;
@ -457,6 +461,7 @@ void TextEdit::_click_selection_held() {
} }
void TextEdit::_update_selection_mode_pointer() { void TextEdit::_update_selection_mode_pointer() {
dragging_selection = true;
Point2 mp = get_local_mouse_position(); Point2 mp = get_local_mouse_position();
int row, col; int row, col;
@ -472,6 +477,7 @@ void TextEdit::_update_selection_mode_pointer() {
} }
void TextEdit::_update_selection_mode_word() { void TextEdit::_update_selection_mode_word() {
dragging_selection = true;
Point2 mp = get_local_mouse_position(); Point2 mp = get_local_mouse_position();
int row, col; int row, col;
@ -528,6 +534,7 @@ void TextEdit::_update_selection_mode_word() {
} }
void TextEdit::_update_selection_mode_line() { void TextEdit::_update_selection_mode_line() {
dragging_selection = true;
Point2 mp = get_local_mouse_position(); Point2 mp = get_local_mouse_position();
int row, col; int row, col;
@ -552,6 +559,30 @@ void TextEdit::_update_selection_mode_line() {
click_select_held->start(); click_select_held->start();
} }
void TextEdit::_update_minimap_scroll() {
Point2 mp = get_local_mouse_position();
int xmargin_end = get_size().width - cache.style_normal->get_margin(MARGIN_RIGHT);
if (!dragging_minimap && (mp.x < xmargin_end - minimap_width || mp.y > xmargin_end)) {
minimap_clicked = false;
return;
}
minimap_clicked = true;
dragging_minimap = true;
int row;
_get_minimap_mouse_row(Point2i(mp.x, mp.y), row);
int wi;
int first_line = row - num_lines_from_rows(row, 0, -get_visible_rows() / 2, wi) + 1;
double delta = get_scroll_pos_for_line(first_line, wi) - get_v_scroll();
if (delta < 0) {
_scroll_up(-delta);
} else {
_scroll_down(delta);
}
}
void TextEdit::_notification(int p_what) { void TextEdit::_notification(int p_what) {
switch (p_what) { switch (p_what) {
@ -573,6 +604,7 @@ void TextEdit::_notification(int p_what) {
_update_caches(); _update_caches();
_update_wrap_at(); _update_wrap_at();
syntax_highlighting_cache.clear();
} break; } break;
case MainLoop::NOTIFICATION_WM_FOCUS_IN: { case MainLoop::NOTIFICATION_WM_FOCUS_IN: {
window_has_focus = true; window_has_focus = true;
@ -588,22 +620,24 @@ void TextEdit::_notification(int p_what) {
if (scrolling && get_v_scroll() != target_v_scroll) { if (scrolling && get_v_scroll() != target_v_scroll) {
double target_y = target_v_scroll - get_v_scroll(); double target_y = target_v_scroll - get_v_scroll();
double dist = sqrt(target_y * target_y); double dist = sqrt(target_y * target_y);
double vel = ((target_y / dist) * v_scroll_speed) * get_physics_process_delta_time(); // To ensure minimap is responsive overide the speed setting.
double vel = ((target_y / dist) * ((minimap_clicked) ? 3000 : v_scroll_speed)) * get_physics_process_delta_time();
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;
minimap_clicked = false;
set_physics_process_internal(false); set_physics_process_internal(false);
} else { } else {
set_v_scroll(get_v_scroll() + vel); set_v_scroll(get_v_scroll() + vel);
} }
} else { } else {
scrolling = false; scrolling = false;
minimap_clicked = false;
set_physics_process_internal(false); set_physics_process_internal(false);
} }
} break; } break;
case NOTIFICATION_DRAW: { case NOTIFICATION_DRAW: {
if (first_draw) { if (first_draw) {
// Size may not be the final one, so attempts to ensure cursor was visible may have failed. // Size may not be the final one, so attempts to ensure cursor was visible may have failed.
adjust_viewport_to_cursor(); adjust_viewport_to_cursor();
@ -635,6 +669,11 @@ void TextEdit::_notification(int p_what) {
cache.fold_gutter_width = 0; cache.fold_gutter_width = 0;
} }
cache.minimap_width = 0;
if (draw_minimap) {
cache.minimap_width = minimap_width;
}
int line_number_char_count = 0; int line_number_char_count = 0;
{ {
@ -658,7 +697,8 @@ void TextEdit::_notification(int p_what) {
RID ci = get_canvas_item(); RID ci = get_canvas_item();
VisualServer::get_singleton()->canvas_item_set_clip(get_canvas_item(), true); VisualServer::get_singleton()->canvas_item_set_clip(get_canvas_item(), true);
int xmargin_beg = cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width + cache.fold_gutter_width + cache.info_gutter_width; int xmargin_beg = cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width + cache.fold_gutter_width + cache.info_gutter_width;
int xmargin_end = size.width - cache.style_normal->get_margin(MARGIN_RIGHT);
int xmargin_end = size.width - cache.style_normal->get_margin(MARGIN_RIGHT) - cache.minimap_width;
// Let's do it easy for now. // Let's do it easy for now.
cache.style_normal->draw(ci, Rect2(Point2(), size)); cache.style_normal->draw(ci, Rect2(Point2(), size));
if (readonly) { if (readonly) {
@ -847,9 +887,162 @@ void TextEdit::_notification(int p_what) {
FontDrawer drawer(cache.font, Color(1, 1, 1)); FontDrawer drawer(cache.font, Color(1, 1, 1));
int line = get_first_visible_line() - 1; int first_visible_line = get_first_visible_line() - 1;
int draw_amount = visible_rows + (smooth_scroll_enabled ? 1 : 0); int draw_amount = visible_rows + (smooth_scroll_enabled ? 1 : 0);
draw_amount += times_line_wraps(line + 1); draw_amount += times_line_wraps(first_visible_line + 1);
// minimap
if (draw_minimap) {
int minimap_visible_lines = _get_minimap_visible_rows();
int minimap_line_height = (minimap_char_size.y + minimap_line_spacing);
int minimap_tab_size = minimap_char_size.x * indent_size;
// calculate viewport size and y offset
int viewport_height = (draw_amount - 1) * minimap_line_height;
int control_height = size.height;
control_height -= cache.style_normal->get_minimum_size().height;
if (h_scroll->is_visible_in_tree()) {
control_height -= h_scroll->get_size().height;
}
control_height -= viewport_height;
int viewport_offset_y = round(get_scroll_pos_for_line(first_visible_line) * control_height) / ((v_scroll->get_max() <= minimap_visible_lines) ? (minimap_visible_lines - draw_amount) : (v_scroll->get_max() - draw_amount));
// calculate the first line.
int num_lines_before = round((viewport_offset_y) / minimap_line_height);
int wi;
int minimap_line = (v_scroll->get_max() <= minimap_visible_lines) ? -1 : first_visible_line;
if (minimap_line >= 0) {
minimap_line -= num_lines_from_rows(first_visible_line, 0, -num_lines_before, wi);
minimap_line -= (smooth_scroll_enabled ? 1 : 0);
}
int minimap_draw_amount = minimap_visible_lines + times_line_wraps(minimap_line + 1);
// draw the minimap
Color viewport_color = cache.current_line_color;
viewport_color.a /= 2;
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2((xmargin_end + 2), viewport_offset_y, cache.minimap_width, viewport_height), viewport_color);
for (int i = 0; i < minimap_draw_amount; i++) {
minimap_line++;
if (minimap_line < 0 || minimap_line >= (int)text.size()) {
break;
}
while (is_line_hidden(minimap_line)) {
minimap_line++;
if (minimap_line < 0 || minimap_line >= (int)text.size()) {
break;
}
}
Map<int, HighlighterInfo> color_map;
if (syntax_coloring) {
color_map = _get_line_syntax_highlighting(minimap_line);
}
Color current_color = cache.font_color;
if (readonly) {
current_color = cache.font_color_readonly;
}
Vector<String> wrap_rows = get_wrap_rows_text(minimap_line);
int line_wrap_amount = times_line_wraps(minimap_line);
int last_wrap_column = 0;
for (int line_wrap_index = 0; line_wrap_index < line_wrap_amount + 1; line_wrap_index++) {
if (line_wrap_index != 0) {
i++;
if (i >= minimap_draw_amount)
break;
}
const String &str = wrap_rows[line_wrap_index];
int indent_px = line_wrap_index != 0 ? get_indent_level(minimap_line) : 0;
if (indent_px >= wrap_at) {
indent_px = 0;
}
indent_px = minimap_char_size.x * indent_px;
if (line_wrap_index > 0) {
last_wrap_column += wrap_rows[line_wrap_index - 1].length();
}
if (minimap_line == cursor.line && cursor_wrap_index == line_wrap_index && highlight_current_line) {
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2((xmargin_end + 2), i * 3, cache.minimap_width, 2), cache.current_line_color);
}
Color previous_color;
int characters = 0;
int tabs = 0;
for (int j = 0; j < str.length(); j++) {
if (syntax_coloring) {
if (color_map.has(last_wrap_column + j)) {
current_color = color_map[last_wrap_column + j].color;
if (readonly) {
current_color.a = cache.font_color_readonly.a;
}
}
color = current_color;
}
if (j == 0) {
previous_color = color;
}
int xpos = indent_px + ((xmargin_end + minimap_char_size.x) + (minimap_char_size.x * j)) + tabs;
bool out_of_bounds = (xpos >= xmargin_end + cache.minimap_width);
bool is_whitespace = _is_whitespace(str[j]);
if (!is_whitespace) {
characters++;
if (j < str.length() - 1 && color == previous_color && !out_of_bounds) {
continue;
}
// If we've changed colour we are at the start of a new section, therefore we need to go back to the end
// of the previous section to draw it, we'll also add the character back on.
if (color != previous_color) {
characters--;
j--;
if (str[j] == '\t') {
tabs -= minimap_tab_size;
}
}
}
if (characters > 0) {
previous_color.a *= 0.6;
// take one for zero indexing, and if we hit whitespace / the end of a word.
int chars = MAX(0, (j - (characters - 1)) - (is_whitespace ? 1 : 0)) + 1;
int char_x_ofs = indent_px + ((xmargin_end + minimap_char_size.x) + (minimap_char_size.x * chars)) + tabs;
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(Point2(char_x_ofs, minimap_line_height * i), Point2(minimap_char_size.x * characters, minimap_char_size.y)), previous_color);
}
if (out_of_bounds) {
break;
}
// re-adjust if we went backwards.
if (color != previous_color && !is_whitespace) {
characters++;
}
if (str[j] == '\t') {
tabs += minimap_tab_size;
}
previous_color = color;
characters = 0;
}
}
}
}
// draw main text
int line = first_visible_line;
for (int i = 0; i < draw_amount; i++) { for (int i = 0; i < draw_amount; i++) {
line++; line++;
@ -1521,7 +1714,6 @@ void TextEdit::_notification(int p_what) {
OS::get_singleton()->set_ime_active(true); OS::get_singleton()->set_ime_active(true);
OS::get_singleton()->set_ime_position(get_global_position() + cursor_pos + Point2(0, get_row_height())); OS::get_singleton()->set_ime_position(get_global_position() + cursor_pos + Point2(0, get_row_height()));
} }
} break; } break;
case NOTIFICATION_FOCUS_ENTER: { case NOTIFICATION_FOCUS_ENTER: {
@ -1862,6 +2054,66 @@ void TextEdit::_get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) co
r_col = col; r_col = col;
} }
void TextEdit::_get_minimap_mouse_row(const Point2i &p_mouse, int &r_row) const {
float rows = p_mouse.y;
rows -= cache.style_normal->get_margin(MARGIN_TOP);
rows /= (minimap_char_size.y + minimap_line_spacing);
rows += get_v_scroll_offset();
// calculate visible lines
int minimap_visible_lines = _get_minimap_visible_rows();
int visible_rows = get_visible_rows() + 1;
int first_visible_line = get_first_visible_line() - 1;
int draw_amount = visible_rows + (smooth_scroll_enabled ? 1 : 0);
draw_amount += times_line_wraps(first_visible_line + 1);
int minimap_line_height = (minimap_char_size.y + minimap_line_spacing);
// calculate viewport size and y offset
int viewport_height = (draw_amount - 1) * minimap_line_height;
int control_height = get_size().height;
control_height -= cache.style_normal->get_minimum_size().height;
if (h_scroll->is_visible_in_tree()) {
control_height -= h_scroll->get_size().height;
}
control_height -= viewport_height;
int viewport_offset_y = round(get_scroll_pos_for_line(first_visible_line) * control_height) / ((v_scroll->get_max() <= minimap_visible_lines) ? (minimap_visible_lines - draw_amount) : (v_scroll->get_max() - draw_amount));
// calculate the first line.
int num_lines_before = round((viewport_offset_y) / minimap_line_height);
int wi;
int minimap_line = (v_scroll->get_max() <= minimap_visible_lines) ? -1 : first_visible_line;
if (first_visible_line >= 0 && minimap_line >= 0) {
minimap_line -= num_lines_from_rows(first_visible_line, 0, -num_lines_before, wi);
minimap_line -= (smooth_scroll_enabled ? 1 : 0);
} else {
minimap_line = 0;
}
int row = minimap_line + Math::floor(rows);
int wrap_index = 0;
if (is_wrap_enabled() || is_hiding_enabled()) {
int f_ofs = num_lines_from_rows(minimap_line, cursor.wrap_ofs, rows + (1 * SGN(rows)), wrap_index) - 1;
if (rows < 0) {
row = minimap_line - f_ofs;
} else {
row = minimap_line + f_ofs;
}
}
if (row < 0) {
row = 0;
}
if (row >= text.size()) {
row = text.size() - 1;
}
r_row = row;
}
void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
double prev_v_scroll = v_scroll->get_value(); double prev_v_scroll = v_scroll->get_value();
@ -1986,6 +2238,14 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
} }
// minimap
if (draw_minimap) {
_update_minimap_scroll();
if (dragging_minimap) {
return;
}
}
int prev_col = cursor.column; int prev_col = cursor.column;
int prev_line = cursor.line; int prev_line = cursor.line;
@ -2100,8 +2360,11 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
} else { } else {
if (mb->get_button_index() == BUTTON_LEFT) if (mb->get_button_index() == BUTTON_LEFT) {
dragging_minimap = false;
dragging_selection = false;
click_select_held->stop(); click_select_held->stop();
}
// Notify to show soft keyboard. // Notify to show soft keyboard.
notification(NOTIFICATION_FOCUS_ENTER); notification(NOTIFICATION_FOCUS_ENTER);
@ -2147,18 +2410,24 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
if (mm->get_button_mask() & BUTTON_MASK_LEFT && get_viewport()->gui_get_drag_data() == Variant()) { // Ignore if dragging. if (mm->get_button_mask() & BUTTON_MASK_LEFT && get_viewport()->gui_get_drag_data() == Variant()) { // Ignore if dragging.
_reset_caret_blink_timer(); _reset_caret_blink_timer();
switch (selection.selecting_mode) { if (draw_minimap && !dragging_selection) {
case Selection::MODE_POINTER: { _update_minimap_scroll();
_update_selection_mode_pointer(); }
} break;
case Selection::MODE_WORD: { if (!dragging_minimap) {
_update_selection_mode_word(); switch (selection.selecting_mode) {
} break; case Selection::MODE_POINTER: {
case Selection::MODE_LINE: { _update_selection_mode_pointer();
_update_selection_mode_line(); } break;
} break; case Selection::MODE_WORD: {
default: { _update_selection_mode_word();
break; } break;
case Selection::MODE_LINE: {
_update_selection_mode_line();
} break;
default: {
break;
}
} }
} }
} }
@ -3343,8 +3612,10 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
void TextEdit::_scroll_up(real_t p_delta) { void TextEdit::_scroll_up(real_t p_delta) {
if (scrolling && smooth_scroll_enabled && SGN(target_v_scroll - v_scroll->get_value()) != SGN(-p_delta)) if (scrolling && smooth_scroll_enabled && SGN(target_v_scroll - v_scroll->get_value()) != SGN(-p_delta)) {
scrolling = false; scrolling = false;
minimap_clicked = false;
}
if (scrolling) { if (scrolling) {
target_v_scroll = (target_v_scroll - p_delta); target_v_scroll = (target_v_scroll - p_delta);
@ -3369,8 +3640,10 @@ void TextEdit::_scroll_up(real_t p_delta) {
void TextEdit::_scroll_down(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)) if (scrolling && smooth_scroll_enabled && SGN(target_v_scroll - v_scroll->get_value()) != SGN(p_delta)) {
scrolling = false; scrolling = false;
minimap_clicked = false;
}
if (scrolling) { if (scrolling) {
target_v_scroll = (target_v_scroll + p_delta); target_v_scroll = (target_v_scroll + p_delta);
@ -3419,6 +3692,7 @@ void TextEdit::_post_shift_selection() {
void TextEdit::_scroll_lines_up() { void TextEdit::_scroll_lines_up() {
scrolling = false; scrolling = false;
minimap_clicked = false;
// Adjust the vertical scroll. // Adjust the vertical scroll.
set_v_scroll(get_v_scroll() - 1); set_v_scroll(get_v_scroll() - 1);
@ -3438,6 +3712,7 @@ void TextEdit::_scroll_lines_up() {
void TextEdit::_scroll_lines_down() { void TextEdit::_scroll_lines_down() {
scrolling = false; scrolling = false;
minimap_clicked = false;
// Adjust the vertical scroll. // Adjust the vertical scroll.
set_v_scroll(get_v_scroll() + 1); set_v_scroll(get_v_scroll() + 1);
@ -3714,6 +3989,15 @@ void TextEdit::_line_edited_from(int p_line) {
for (int i = p_line; i < cache_size; i++) { for (int i = p_line; i < cache_size; i++) {
color_region_cache.erase(i); color_region_cache.erase(i);
} }
if (syntax_highlighting_cache.size() > 0) {
cache_size = syntax_highlighting_cache.back()->key();
for (int i = p_line - 1; i < cache_size; i++) {
if (syntax_highlighting_cache.has(i)) {
syntax_highlighting_cache.erase(i);
}
}
}
} }
int TextEdit::get_char_count() { int TextEdit::get_char_count() {
@ -3745,6 +4029,15 @@ int TextEdit::get_visible_rows() const {
return total; return total;
} }
int TextEdit::_get_minimap_visible_rows() const {
int total = get_size().height;
total -= cache.style_normal->get_minimum_size().height;
if (h_scroll->is_visible_in_tree())
total -= h_scroll->get_size().height;
total /= (minimap_char_size.y + minimap_line_spacing);
return total;
}
int TextEdit::get_total_visible_rows() const { int TextEdit::get_total_visible_rows() const {
// Returns the total amount of rows we need in the editor. // Returns the total amount of rows we need in the editor.
@ -3764,7 +4057,7 @@ int TextEdit::get_total_visible_rows() const {
void TextEdit::_update_wrap_at() { void TextEdit::_update_wrap_at() {
wrap_at = get_size().width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width - cache.fold_gutter_width - cache.info_gutter_width - wrap_right_offset; wrap_at = get_size().width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width - cache.fold_gutter_width - cache.info_gutter_width - cache.minimap_width - wrap_right_offset;
update_cursor_wrap_offset(); update_cursor_wrap_offset();
text.clear_wrap_cache(); text.clear_wrap_cache();
@ -3781,6 +4074,7 @@ void TextEdit::adjust_viewport_to_cursor() {
// Make sure cursor is visible on the screen. // Make sure cursor is visible on the screen.
scrolling = false; scrolling = false;
minimap_clicked = false;
int cur_line = cursor.line; int cur_line = cursor.line;
int cur_wrap = get_cursor_wrap_index(); int cur_wrap = get_cursor_wrap_index();
@ -3798,7 +4092,7 @@ void TextEdit::adjust_viewport_to_cursor() {
set_line_as_last_visible(cur_line, cur_wrap); set_line_as_last_visible(cur_line, cur_wrap);
} }
int visible_width = get_size().width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width - cache.fold_gutter_width - cache.info_gutter_width; int visible_width = get_size().width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width - cache.fold_gutter_width - cache.info_gutter_width - cache.minimap_width;
if (v_scroll->is_visible_in_tree()) if (v_scroll->is_visible_in_tree())
visible_width -= v_scroll->get_combined_minimum_size().width; visible_width -= v_scroll->get_combined_minimum_size().width;
visible_width -= 20; // Give it a little more space. visible_width -= 20; // Give it a little more space.
@ -3824,12 +4118,13 @@ void TextEdit::center_viewport_to_cursor() {
// Move viewport so the cursor is in the center of the screen. // Move viewport so the cursor is in the center of the screen.
scrolling = false; scrolling = false;
minimap_clicked = false;
if (is_line_hidden(cursor.line)) if (is_line_hidden(cursor.line))
unfold_line(cursor.line); unfold_line(cursor.line);
set_line_as_center_visible(cursor.line, get_cursor_wrap_index()); set_line_as_center_visible(cursor.line, get_cursor_wrap_index());
int visible_width = get_size().width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width - cache.fold_gutter_width - cache.info_gutter_width; int visible_width = get_size().width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width - cache.fold_gutter_width - cache.info_gutter_width - cache.minimap_width;
if (v_scroll->is_visible_in_tree()) if (v_scroll->is_visible_in_tree())
visible_width -= v_scroll->get_combined_minimum_size().width; visible_width -= v_scroll->get_combined_minimum_size().width;
visible_width -= 20; // Give it a little more space. visible_width -= 20; // Give it a little more space.
@ -4112,6 +4407,7 @@ bool TextEdit::is_right_click_moving_caret() const {
void TextEdit::_v_scroll_input() { void TextEdit::_v_scroll_input() {
scrolling = false; scrolling = false;
minimap_clicked = false;
} }
void TextEdit::_scroll_moved(double p_to_val) { void TextEdit::_scroll_moved(double p_to_val) {
@ -4302,6 +4598,11 @@ Control::CursorShape TextEdit::get_cursor_shape(const Point2 &p_pos) const {
return CURSOR_ARROW; return CURSOR_ARROW;
} else { } else {
int xmargin_end = get_size().width - cache.style_normal->get_margin(MARGIN_RIGHT);
if (p_pos.x > xmargin_end - minimap_width && p_pos.x <= xmargin_end) {
return CURSOR_ARROW;
}
int row, col; int row, col;
_get_mouse_pos(p_pos, row, col); _get_mouse_pos(p_pos, row, col);
// EOL fold icon. // EOL fold icon.
@ -4569,6 +4870,7 @@ void TextEdit::_set_syntax_highlighting(SyntaxHighlighter *p_syntax_highlighter)
syntax_highlighter->set_text_editor(this); syntax_highlighter->set_text_editor(this);
syntax_highlighter->_update_cache(); syntax_highlighter->_update_cache();
} }
syntax_highlighting_cache.clear();
update(); update();
} }
@ -4635,6 +4937,7 @@ void TextEdit::clear_colors() {
keywords.clear(); keywords.clear();
color_regions.clear(); color_regions.clear();
color_region_cache.clear(); color_region_cache.clear();
syntax_highlighting_cache.clear();
text.clear_width_cache(); text.clear_width_cache();
} }
@ -6330,6 +6633,24 @@ int TextEdit::get_info_gutter_width() const {
return info_gutter_width; return info_gutter_width;
} }
void TextEdit::set_draw_minimap(bool p_draw) {
draw_minimap = p_draw;
update();
}
bool TextEdit::is_drawing_minimap() const {
return draw_minimap;
}
void TextEdit::set_minimap_width(int p_minimap_width) {
minimap_width = p_minimap_width;
update();
}
int TextEdit::get_minimap_width() const {
return minimap_width;
}
void TextEdit::set_hiding_enabled(bool p_enabled) { void TextEdit::set_hiding_enabled(bool p_enabled) {
if (!p_enabled) if (!p_enabled)
unhide_all_lines(); unhide_all_lines();
@ -6534,6 +6855,11 @@ void TextEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_breakpoints"), &TextEdit::get_breakpoints_array); ClassDB::bind_method(D_METHOD("get_breakpoints"), &TextEdit::get_breakpoints_array);
ClassDB::bind_method(D_METHOD("remove_breakpoints"), &TextEdit::remove_breakpoints); ClassDB::bind_method(D_METHOD("remove_breakpoints"), &TextEdit::remove_breakpoints);
ClassDB::bind_method(D_METHOD("draw_minimap", "draw"), &TextEdit::set_draw_minimap);
ClassDB::bind_method(D_METHOD("is_drawing_minimap"), &TextEdit::is_drawing_minimap);
ClassDB::bind_method(D_METHOD("set_minimap_width", "width"), &TextEdit::set_minimap_width);
ClassDB::bind_method(D_METHOD("get_minimap_width"), &TextEdit::get_minimap_width);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT), "set_text", "get_text"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT), "set_text", "get_text");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "readonly"), "set_readonly", "is_readonly"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "readonly"), "set_readonly", "is_readonly");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "highlight_current_line"), "set_highlight_current_line", "is_highlight_current_line_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "highlight_current_line"), "set_highlight_current_line", "is_highlight_current_line_enabled");
@ -6551,6 +6877,10 @@ void TextEdit::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "hiding_enabled"), "set_hiding_enabled", "is_hiding_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "hiding_enabled"), "set_hiding_enabled", "is_hiding_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "wrap_enabled"), "set_wrap_enabled", "is_wrap_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "wrap_enabled"), "set_wrap_enabled", "is_wrap_enabled");
ADD_GROUP("Minimap", "minimap_");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "minimap_draw"), "draw_minimap", "is_drawing_minimap");
ADD_PROPERTY(PropertyInfo(Variant::INT, "minimap_width"), "set_minimap_width", "get_minimap_width");
ADD_GROUP("Caret", "caret_"); ADD_GROUP("Caret", "caret_");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret_block_mode"), "cursor_set_block_mode", "cursor_is_block_mode"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret_block_mode"), "cursor_set_block_mode", "cursor_is_block_mode");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret_blink"), "cursor_set_blink_enabled", "cursor_get_blink_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret_blink"), "cursor_set_blink_enabled", "cursor_get_blink_enabled");
@ -6687,8 +7017,15 @@ TextEdit::TextEdit() {
select_identifiers_enabled = false; select_identifiers_enabled = false;
smooth_scroll_enabled = false; smooth_scroll_enabled = false;
scrolling = false; scrolling = false;
minimap_clicked = false;
dragging_minimap = false;
dragging_selection = false;
target_v_scroll = 0; target_v_scroll = 0;
v_scroll_speed = 80; v_scroll_speed = 80;
draw_minimap = false;
minimap_width = 80;
minimap_char_size = Point2(1, 2);
minimap_line_spacing = 1;
context_menu_enabled = true; context_menu_enabled = true;
menu = memnew(PopupMenu); menu = memnew(PopupMenu);
@ -6707,8 +7044,14 @@ TextEdit::~TextEdit() {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
Map<int, TextEdit::HighlighterInfo> TextEdit::_get_line_syntax_highlighting(int p_line) { Map<int, TextEdit::HighlighterInfo> TextEdit::_get_line_syntax_highlighting(int p_line) {
if (syntax_highlighting_cache.has(p_line)) {
return syntax_highlighting_cache[p_line];
}
if (syntax_highlighter != NULL) { if (syntax_highlighter != NULL) {
return syntax_highlighter->_get_line_syntax_highlighting(p_line); Map<int, HighlighterInfo> color_map = syntax_highlighter->_get_line_syntax_highlighting(p_line);
syntax_highlighting_cache[p_line] = color_map;
return color_map;
} }
Map<int, HighlighterInfo> color_map; Map<int, HighlighterInfo> color_map;
@ -6890,6 +7233,7 @@ Map<int, TextEdit::HighlighterInfo> TextEdit::_get_line_syntax_highlighting(int
} }
} }
syntax_highlighting_cache[p_line] = color_map;
return color_map; return color_map;
} }

19
scene/gui/text_edit.h
View file

@ -211,9 +211,11 @@ private:
int breakpoint_gutter_width; int breakpoint_gutter_width;
int fold_gutter_width; int fold_gutter_width;
int info_gutter_width; int info_gutter_width;
int minimap_width;
} cache; } cache;
Map<int, int> color_region_cache; Map<int, int> color_region_cache;
Map<int, Map<int, HighlighterInfo> > syntax_highlighting_cache;
struct TextOperation { struct TextOperation {
@ -313,6 +315,10 @@ private:
bool hiding_enabled; bool hiding_enabled;
bool draw_info_gutter; bool draw_info_gutter;
int info_gutter_width; int info_gutter_width;
bool draw_minimap;
int minimap_width;
Point2 minimap_char_size;
int minimap_line_spacing;
bool highlight_all_occurrences; bool highlight_all_occurrences;
bool scroll_past_end_of_file_enabled; bool scroll_past_end_of_file_enabled;
@ -326,6 +332,9 @@ private:
bool smooth_scroll_enabled; bool smooth_scroll_enabled;
bool scrolling; bool scrolling;
bool dragging_selection;
bool dragging_minimap;
bool minimap_clicked;
float target_v_scroll; float target_v_scroll;
float v_scroll_speed; float v_scroll_speed;
@ -360,6 +369,8 @@ private:
int get_visible_rows() const; int get_visible_rows() const;
int get_total_visible_rows() const; int get_total_visible_rows() const;
int _get_minimap_visible_rows() const;
void update_cursor_wrap_offset(); void update_cursor_wrap_offset();
void _update_wrap_at(); void _update_wrap_at();
bool line_wraps(int line) const; bool line_wraps(int line) const;
@ -395,6 +406,7 @@ private:
void _update_selection_mode_word(); void _update_selection_mode_word();
void _update_selection_mode_line(); void _update_selection_mode_line();
void _update_minimap_scroll();
void _scroll_up(real_t p_delta); void _scroll_up(real_t p_delta);
void _scroll_down(real_t p_delta); void _scroll_down(real_t p_delta);
@ -484,6 +496,7 @@ public:
virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const; virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const;
void _get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) const; void _get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) const;
void _get_minimap_mouse_row(const Point2i &p_mouse, int &r_row) const;
//void delete_char(); //void delete_char();
//void delete_line(); //void delete_line();
@ -697,6 +710,12 @@ public:
void set_info_gutter_width(int p_gutter_width); void set_info_gutter_width(int p_gutter_width);
int get_info_gutter_width() const; int get_info_gutter_width() const;
void set_draw_minimap(bool p_draw);
bool is_drawing_minimap() const;
void set_minimap_width(int p_minimap_width);
int get_minimap_width() const;
void set_hiding_enabled(bool p_enabled); void set_hiding_enabled(bool p_enabled);
bool is_hiding_enabled() const; bool is_hiding_enabled() const;