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

Add folding gutter to code_edit

Browse Source
This commit is contained in:
Paulb23 2020-07-27 13:54:12 +01:00
parent 4d7df24d46
commit 7829fdc1d0
6 changed files with 104 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_themes.cpp
View File

@ -868,8 +868,6 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_constant("side_margin", "TabContainer", 0); theme->set_constant("side_margin", "TabContainer", 0);
theme->set_icon("tab", "TextEdit", theme->get_icon("GuiTab", "EditorIcons")); theme->set_icon("tab", "TextEdit", theme->get_icon("GuiTab", "EditorIcons"));
theme->set_icon("space", "TextEdit", theme->get_icon("GuiSpace", "EditorIcons")); theme->set_icon("space", "TextEdit", theme->get_icon("GuiSpace", "EditorIcons"));
theme->set_icon("folded", "TextEdit", theme->get_icon("GuiTreeArrowRight", "EditorIcons"));
theme->set_icon("fold", "TextEdit", theme->get_icon("GuiTreeArrowDown", "EditorIcons"));
theme->set_color("font_color", "TextEdit", font_color); theme->set_color("font_color", "TextEdit", font_color);
theme->set_color("caret_color", "TextEdit", font_color); theme->set_color("caret_color", "TextEdit", font_color);
theme->set_color("selection_color", "TextEdit", font_color_selection); theme->set_color("selection_color", "TextEdit", font_color_selection);
@ -882,7 +880,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_icon("tab", "CodeEdit", theme->get_icon("GuiTab", "EditorIcons")); theme->set_icon("tab", "CodeEdit", theme->get_icon("GuiTab", "EditorIcons"));
theme->set_icon("space", "CodeEdit", theme->get_icon("GuiSpace", "EditorIcons")); theme->set_icon("space", "CodeEdit", theme->get_icon("GuiSpace", "EditorIcons"));
theme->set_icon("folded", "CodeEdit", theme->get_icon("GuiTreeArrowRight", "EditorIcons")); theme->set_icon("folded", "CodeEdit", theme->get_icon("GuiTreeArrowRight", "EditorIcons"));
theme->set_icon("fold", "CodeEdit", theme->get_icon("GuiTreeArrowDown", "EditorIcons")); theme->set_icon("can_fold", "CodeEdit", theme->get_icon("GuiTreeArrowDown", "EditorIcons"));
theme->set_icon("executing_line", "CodeEdit", theme->get_icon("MainPlay", "EditorIcons")); theme->set_icon("executing_line", "CodeEdit", theme->get_icon("MainPlay", "EditorIcons"));
theme->set_color("font_color", "CodeEdit", font_color); theme->set_color("font_color", "CodeEdit", font_color);
theme->set_color("caret_color", "CodeEdit", font_color); theme->set_color("caret_color", "CodeEdit", font_color);

62
scene/gui/code_edit.cpp
View File

@ -36,6 +36,7 @@ void CodeEdit::_notification(int p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
set_gutter_width(main_gutter, cache.row_height); set_gutter_width(main_gutter, cache.row_height);
set_gutter_width(line_number_gutter, (line_number_digits + 1) * cache.font->get_char_size('0').width); set_gutter_width(line_number_gutter, (line_number_digits + 1) * cache.font->get_char_size('0').width);
set_gutter_width(fold_gutter, cache.row_height / 1.2);
breakpoint_color = get_theme_color("breakpoint_color"); breakpoint_color = get_theme_color("breakpoint_color");
breakpoint_icon = get_theme_icon("breakpoint"); breakpoint_icon = get_theme_icon("breakpoint");
@ -47,6 +48,10 @@ void CodeEdit::_notification(int p_what) {
executing_line_icon = get_theme_icon("executing_line"); executing_line_icon = get_theme_icon("executing_line");
line_number_color = get_theme_color("line_number_color"); line_number_color = get_theme_color("line_number_color");
folding_color = get_theme_color("code_folding_color");
can_fold_icon = get_theme_icon("can_fold");
folded_icon = get_theme_icon("folded");
} break; } break;
case NOTIFICATION_DRAW: { case NOTIFICATION_DRAW: {
} break; } break;
@ -232,6 +237,35 @@ void CodeEdit::_line_number_draw_callback(int p_line, int p_gutter, const Rect2
cache.font->draw(get_canvas_item(), Point2(region.position.x, yofs + cache.font->get_ascent()), fc, line_number_color); cache.font->draw(get_canvas_item(), Point2(region.position.x, yofs + cache.font->get_ascent()), fc, line_number_color);
} }
/* Fold Gutter */
void CodeEdit::set_draw_fold_gutter(bool p_draw) {
set_gutter_draw(fold_gutter, p_draw);
}
bool CodeEdit::is_drawing_fold_gutter() const {
return is_gutter_drawn(fold_gutter);
}
void CodeEdit::_fold_gutter_draw_callback(int p_line, int p_gutter, Rect2 p_region) {
if (!can_fold(p_line) && !is_folded(p_line)) {
set_line_gutter_clickable(p_line, fold_gutter, false);
return;
}
set_line_gutter_clickable(p_line, fold_gutter, true);
int horizontal_padding = p_region.size.x / 10;
int vertical_padding = p_region.size.y / 6;
p_region.position += Point2(horizontal_padding, vertical_padding);
p_region.size -= Point2(horizontal_padding, vertical_padding) * 2;
if (can_fold(p_line)) {
can_fold_icon->draw_rect(get_canvas_item(), p_region, false, folding_color);
return;
}
folded_icon->draw_rect(get_canvas_item(), p_region, false, folding_color);
}
void CodeEdit::_bind_methods() { void CodeEdit::_bind_methods() {
/* Main Gutter */ /* Main Gutter */
ClassDB::bind_method(D_METHOD("_main_gutter_draw_callback"), &CodeEdit::_main_gutter_draw_callback); ClassDB::bind_method(D_METHOD("_main_gutter_draw_callback"), &CodeEdit::_main_gutter_draw_callback);
@ -271,6 +305,12 @@ void CodeEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_line_numbers_zero_padded", "enable"), &CodeEdit::set_line_numbers_zero_padded); ClassDB::bind_method(D_METHOD("set_line_numbers_zero_padded", "enable"), &CodeEdit::set_line_numbers_zero_padded);
ClassDB::bind_method(D_METHOD("is_line_numbers_zero_padded"), &CodeEdit::is_line_numbers_zero_padded); ClassDB::bind_method(D_METHOD("is_line_numbers_zero_padded"), &CodeEdit::is_line_numbers_zero_padded);
/* Fold Gutter */
ClassDB::bind_method(D_METHOD("_fold_gutter_draw_callback"), &CodeEdit::_fold_gutter_draw_callback);
ClassDB::bind_method(D_METHOD("set_draw_fold_gutter", "enable"), &CodeEdit::set_draw_fold_gutter);
ClassDB::bind_method(D_METHOD("is_drawing_fold_gutter"), &CodeEdit::is_drawing_fold_gutter);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_breakpoints_gutter"), "set_draw_breakpoints_gutter", "is_drawing_breakpoints_gutter"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_breakpoints_gutter"), "set_draw_breakpoints_gutter", "is_drawing_breakpoints_gutter");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_bookmarks"), "set_draw_bookmarks_gutter", "is_drawing_bookmarks_gutter"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_bookmarks"), "set_draw_bookmarks_gutter", "is_drawing_bookmarks_gutter");
@ -297,6 +337,15 @@ void CodeEdit::_gutter_clicked(int p_line, int p_gutter) {
cursor_set_line(p_line); cursor_set_line(p_line);
return; return;
} }
if (p_gutter == fold_gutter) {
if (is_folded(p_line)) {
unfold_line(p_line);
} else if (can_fold(p_line)) {
fold_line(p_line);
}
return;
}
} }
void CodeEdit::_lines_edited_from(int p_from_line, int p_to_line) { void CodeEdit::_lines_edited_from(int p_from_line, int p_to_line) {
@ -342,6 +391,11 @@ void CodeEdit::_update_gutter_indexes() {
line_number_gutter = i; line_number_gutter = i;
continue; continue;
} }
if (get_gutter_name(i) == "fold_gutter") {
fold_gutter = i;
continue;
}
} }
} }
@ -366,6 +420,14 @@ CodeEdit::CodeEdit() {
set_gutter_custom_draw(gutter_idx, this, "_line_number_draw_callback"); set_gutter_custom_draw(gutter_idx, this, "_line_number_draw_callback");
gutter_idx++; gutter_idx++;
/* Fold Gutter */
add_gutter();
set_gutter_name(gutter_idx, "fold_gutter");
set_gutter_draw(gutter_idx, false);
set_gutter_type(gutter_idx, GUTTER_TPYE_CUSTOM);
set_gutter_custom_draw(gutter_idx, this, "_fold_gutter_draw_callback");
gutter_idx++;
connect("lines_edited_from", callable_mp(this, &CodeEdit::_lines_edited_from)); connect("lines_edited_from", callable_mp(this, &CodeEdit::_lines_edited_from));
connect("gutter_clicked", callable_mp(this, &CodeEdit::_gutter_clicked)); connect("gutter_clicked", callable_mp(this, &CodeEdit::_gutter_clicked));

12
scene/gui/code_edit.h
View File

@ -71,6 +71,14 @@ private:
Color line_number_color = Color(1, 1, 1); Color line_number_color = Color(1, 1, 1);
void _line_number_draw_callback(int p_line, int p_gutter, const Rect2 &p_region); void _line_number_draw_callback(int p_line, int p_gutter, const Rect2 &p_region);
/* Fold Gutter */
int fold_gutter = -1;
bool draw_fold_gutter = false;
Color folding_color = Color(1, 1, 1);
Ref<Texture2D> can_fold_icon = Ref<Texture2D>();
Ref<Texture2D> folded_icon = Ref<Texture2D>();
void _fold_gutter_draw_callback(int p_line, int p_gutter, Rect2 p_region);
void _gutter_clicked(int p_line, int p_gutter); void _gutter_clicked(int p_line, int p_gutter);
void _lines_edited_from(int p_from_line, int p_to_line); void _lines_edited_from(int p_from_line, int p_to_line);
@ -116,6 +124,10 @@ public:
void set_line_numbers_zero_padded(bool p_zero_padded); void set_line_numbers_zero_padded(bool p_zero_padded);
bool is_line_numbers_zero_padded() const; bool is_line_numbers_zero_padded() const;
/* Fold gutter */
void set_draw_fold_gutter(bool p_draw);
bool is_drawing_fold_gutter() const;
CodeEdit(); CodeEdit();
~CodeEdit(); ~CodeEdit();
}; };

137
scene/gui/text_edit.cpp
View File

@ -282,10 +282,6 @@ void TextEdit::_update_scrollbars() {
total_width += cache.info_gutter_width; total_width += cache.info_gutter_width;
} }
if (draw_fold_gutter) {
total_width += cache.fold_gutter_width;
}
if (draw_minimap) { if (draw_minimap) {
total_width += cache.minimap_width; total_width += cache.minimap_width;
} }
@ -583,13 +579,6 @@ void TextEdit::_notification(int p_what) {
cache.info_gutter_width = 0; cache.info_gutter_width = 0;
} }
if (draw_fold_gutter) {
fold_gutter_width = (get_row_height() * 55) / 100;
cache.fold_gutter_width = fold_gutter_width;
} else {
cache.fold_gutter_width = 0;
}
cache.minimap_width = 0; cache.minimap_width = 0;
if (draw_minimap) { if (draw_minimap) {
cache.minimap_width = minimap_width; cache.minimap_width = minimap_width;
@ -599,7 +588,7 @@ void TextEdit::_notification(int p_what) {
RID ci = get_canvas_item(); RID ci = get_canvas_item();
RenderingServer::get_singleton()->canvas_item_set_clip(get_canvas_item(), true); RenderingServer::get_singleton()->canvas_item_set_clip(get_canvas_item(), true);
int xmargin_beg = cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + gutter_padding + cache.fold_gutter_width + cache.info_gutter_width; int xmargin_beg = cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + gutter_padding + cache.info_gutter_width;
int xmargin_end = size.width - cache.style_normal->get_margin(MARGIN_RIGHT) - cache.minimap_width; 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.
@ -1118,21 +1107,6 @@ void TextEdit::_notification(int p_what) {
draw_texture_rect(info_icon, Rect2(icon_pos, icon_size)); draw_texture_rect(info_icon, Rect2(icon_pos, icon_size));
} }
// Draw fold markers.
if (draw_fold_gutter) {
int horizontal_gap = (cache.fold_gutter_width * 30) / 100;
int gutter_left = cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + cache.info_gutter_width;
if (is_folded(line)) {
int xofs = horizontal_gap - (cache.can_fold_icon->get_width()) / 2;
int yofs = (get_row_height() - cache.folded_icon->get_height()) / 2;
cache.folded_icon->draw(ci, Point2(gutter_left + xofs + ofs_x, ofs_y + yofs), cache.code_folding_color);
} else if (can_fold(line)) {
int xofs = -cache.can_fold_icon->get_width() / 2 - horizontal_gap + 3;
int yofs = (get_row_height() - cache.can_fold_icon->get_height()) / 2;
cache.can_fold_icon->draw(ci, Point2(gutter_left + xofs + ofs_x, ofs_y + yofs), cache.code_folding_color);
}
}
} }
// Loop through characters in one line. // Loop through characters in one line.
@ -2000,7 +1974,7 @@ void TextEdit::_get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) co
row = text.size() - 1; row = text.size() - 1;
col = text[row].size(); col = text[row].size();
} else { } else {
int colx = p_mouse.x - (cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + gutter_padding + cache.fold_gutter_width + cache.info_gutter_width); int colx = p_mouse.x - (cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + gutter_padding + cache.info_gutter_width);
colx += cursor.x_ofs; colx += cursor.x_ofs;
col = get_char_pos_for_line(colx, row, wrap_index); col = get_char_pos_for_line(colx, row, wrap_index);
if (is_wrap_enabled() && wrap_index < times_line_wraps(row)) { if (is_wrap_enabled() && wrap_index < times_line_wraps(row)) {
@ -2045,7 +2019,7 @@ Vector2i TextEdit::_get_cursor_pixel_pos() {
// Calculate final pixel position // Calculate final pixel position
int y = (row - get_v_scroll_offset() + 1 /*Bottom of line*/) * get_row_height(); int y = (row - get_v_scroll_offset() + 1 /*Bottom of line*/) * get_row_height();
int x = cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + gutter_padding + cache.fold_gutter_width + cache.info_gutter_width - cursor.x_ofs; int x = cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + gutter_padding + cache.info_gutter_width - cursor.x_ofs;
int ix = 0; int ix = 0;
while (ix < rows2[0].size() && ix < cursor.column) { while (ix < rows2[0].size() && ix < cursor.column) {
if (cache.font != nullptr) { if (cache.font != nullptr) {
@ -2196,33 +2170,16 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
// Emit info clicked. // Emit info clicked.
if (draw_info_gutter && text.has_info_icon(row)) { if (draw_info_gutter && text.has_info_icon(row)) {
left_margin = cache.style_normal->get_margin(MARGIN_LEFT); if (mb->get_position().x > left_margin - 6 && mb->get_position().x <= left_margin + cache.info_gutter_width - 3) {
int gutter_left = left_margin + gutters_width;
if (mb->get_position().x > gutter_left - 6 && mb->get_position().x <= gutter_left + cache.info_gutter_width - 3) {
emit_signal("info_clicked", row, text.get_info(row)); emit_signal("info_clicked", row, text.get_info(row));
return; return;
} }
} }
// Toggle fold on gutter click if can.
if (draw_fold_gutter) {
left_margin = cache.style_normal->get_margin(MARGIN_LEFT);
int gutter_left = left_margin + gutters_width + cache.info_gutter_width;
if (mb->get_position().x > gutter_left - 6 && mb->get_position().x <= gutter_left + cache.fold_gutter_width - 3) {
if (is_folded(row)) {
unfold_line(row);
} else if (can_fold(row)) {
fold_line(row);
}
return;
}
}
// Unfold on folded icon click. // Unfold on folded icon click.
if (is_folded(row)) { if (is_folded(row)) {
int line_width = text.get_line_width(row); left_margin += cache.info_gutter_width + gutter_padding + text.get_line_width(row) - cursor.x_ofs;
line_width += cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + gutter_padding + cache.info_gutter_width + cache.fold_gutter_width - cursor.x_ofs; if (mb->get_position().x > left_margin && mb->get_position().x <= left_margin + cache.folded_eol_icon->get_width() + 3) {
if (mb->get_position().x > line_width - 3 && mb->get_position().x <= line_width + cache.folded_eol_icon->get_width() + 3) {
unfold_line(row); unfold_line(row);
return; return;
} }
@ -4074,7 +4031,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 - gutters_width - gutter_padding - cache.fold_gutter_width - cache.info_gutter_width - cache.minimap_width - wrap_right_offset; wrap_at = get_size().width - cache.style_normal->get_minimum_size().width - gutters_width - gutter_padding - 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();
@ -4109,7 +4066,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 - gutters_width - gutter_padding - cache.fold_gutter_width - cache.info_gutter_width - cache.minimap_width; int visible_width = get_size().width - cache.style_normal->get_minimum_size().width - gutters_width - gutter_padding - 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;
} }
@ -4144,7 +4101,7 @@ void TextEdit::center_viewport_to_cursor() {
} }
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 - gutters_width - gutter_padding - cache.fold_gutter_width - cache.info_gutter_width - cache.minimap_width; int visible_width = get_size().width - cache.style_normal->get_minimum_size().width - gutters_width - gutter_padding - 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;
} }
@ -4591,15 +4548,16 @@ Control::CursorShape TextEdit::get_cursor_shape(const Point2 &p_pos) const {
return CURSOR_POINTING_HAND; return CURSOR_POINTING_HAND;
} }
int gutter = cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + cache.fold_gutter_width + cache.info_gutter_width;
if ((completion_active && completion_rect.has_point(p_pos))) { if ((completion_active && completion_rect.has_point(p_pos))) {
return CURSOR_ARROW; return CURSOR_ARROW;
} }
if (p_pos.x < gutter) {
int row, col;
_get_mouse_pos(p_pos, row, col);
int left_margin = cache.style_normal->get_margin(MARGIN_LEFT);
int row, col;
_get_mouse_pos(p_pos, row, col);
int left_margin = cache.style_normal->get_margin(MARGIN_LEFT);
int gutter = left_margin + gutters_width + cache.info_gutter_width;
if (p_pos.x < gutter) {
for (int i = 0; i < gutters.size(); i++) { for (int i = 0; i < gutters.size(); i++) {
if (!gutters[i].draw) { if (!gutters[i].draw) {
continue; continue;
@ -4613,42 +4571,27 @@ Control::CursorShape TextEdit::get_cursor_shape(const Point2 &p_pos) const {
left_margin += gutters[i].width; left_margin += gutters[i].width;
} }
left_margin += gutters_width;
// Info icons. // Info icons.
int gutter_left = left_margin + cache.info_gutter_width; if (draw_info_gutter && p_pos.x > left_margin - 6 && p_pos.x <= left_margin + cache.info_gutter_width - 3) {
if (draw_info_gutter && p_pos.x > left_margin - 6 && p_pos.x <= gutter_left - 3) {
if (text.has_info_icon(row)) { if (text.has_info_icon(row)) {
return CURSOR_POINTING_HAND; return CURSOR_POINTING_HAND;
} }
return CURSOR_ARROW; return CURSOR_ARROW;
} }
// Fold icon.
if (draw_fold_gutter && p_pos.x > gutter_left - 6 && p_pos.x <= gutter_left + cache.fold_gutter_width - 3) {
if (is_folded(row) || can_fold(row)) {
return CURSOR_POINTING_HAND;
} else {
return CURSOR_ARROW;
}
}
return CURSOR_ARROW; return CURSOR_ARROW;
} else { }
int xmargin_end = get_size().width - cache.style_normal->get_margin(MARGIN_RIGHT);
if (draw_minimap && p_pos.x > xmargin_end - minimap_width && p_pos.x <= xmargin_end) {
return CURSOR_ARROW;
}
int row, col; int xmargin_end = get_size().width - cache.style_normal->get_margin(MARGIN_RIGHT);
_get_mouse_pos(p_pos, row, col); if (draw_minimap && p_pos.x > xmargin_end - minimap_width && p_pos.x <= xmargin_end) {
// EOL fold icon. return CURSOR_ARROW;
if (is_folded(row)) { }
int line_width = text.get_line_width(row);
line_width += cache.style_normal->get_margin(MARGIN_LEFT) + gutters_width + gutter_padding + cache.fold_gutter_width + cache.info_gutter_width - cursor.x_ofs; // EOL fold icon.
if (p_pos.x > line_width - 3 && p_pos.x <= line_width + cache.folded_eol_icon->get_width() + 3) { if (is_folded(row)) {
return CURSOR_POINTING_HAND; gutter += gutter_padding + text.get_line_width(row) - cursor.x_ofs;
} if (p_pos.x > gutter - 3 && p_pos.x <= gutter + cache.folded_eol_icon->get_width() + 3) {
return CURSOR_POINTING_HAND;
} }
} }
@ -4870,8 +4813,6 @@ void TextEdit::_update_caches() {
cache.row_height = cache.font->get_height() + cache.line_spacing; cache.row_height = cache.font->get_height() + cache.line_spacing;
cache.tab_icon = get_theme_icon("tab"); cache.tab_icon = get_theme_icon("tab");
cache.space_icon = get_theme_icon("space"); cache.space_icon = get_theme_icon("space");
cache.folded_icon = get_theme_icon("folded");
cache.can_fold_icon = get_theme_icon("fold");
cache.folded_eol_icon = get_theme_icon("GuiEllipsis", "EditorIcons"); cache.folded_eol_icon = get_theme_icon("GuiEllipsis", "EditorIcons");
text.set_font(cache.font); text.set_font(cache.font);
text.clear_width_cache(); text.clear_width_cache();
@ -6603,24 +6544,6 @@ void TextEdit::set_line_length_guideline_hard_column(int p_column) {
update(); update();
} }
void TextEdit::set_draw_fold_gutter(bool p_draw) {
draw_fold_gutter = p_draw;
update();
}
bool TextEdit::is_drawing_fold_gutter() const {
return draw_fold_gutter;
}
void TextEdit::set_fold_gutter_width(int p_gutter_width) {
fold_gutter_width = p_gutter_width;
update();
}
int TextEdit::get_fold_gutter_width() const {
return cache.fold_gutter_width;
}
void TextEdit::set_draw_info_gutter(bool p_draw) { void TextEdit::set_draw_info_gutter(bool p_draw) {
draw_info_gutter = p_draw; draw_info_gutter = p_draw;
update(); update();
@ -6849,8 +6772,6 @@ void TextEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_drawing_tabs"), &TextEdit::is_drawing_tabs); ClassDB::bind_method(D_METHOD("is_drawing_tabs"), &TextEdit::is_drawing_tabs);
ClassDB::bind_method(D_METHOD("set_draw_spaces"), &TextEdit::set_draw_spaces); ClassDB::bind_method(D_METHOD("set_draw_spaces"), &TextEdit::set_draw_spaces);
ClassDB::bind_method(D_METHOD("is_drawing_spaces"), &TextEdit::is_drawing_spaces); ClassDB::bind_method(D_METHOD("is_drawing_spaces"), &TextEdit::is_drawing_spaces);
ClassDB::bind_method(D_METHOD("set_draw_fold_gutter"), &TextEdit::set_draw_fold_gutter);
ClassDB::bind_method(D_METHOD("is_drawing_fold_gutter"), &TextEdit::is_drawing_fold_gutter);
ClassDB::bind_method(D_METHOD("set_hiding_enabled", "enable"), &TextEdit::set_hiding_enabled); ClassDB::bind_method(D_METHOD("set_hiding_enabled", "enable"), &TextEdit::set_hiding_enabled);
ClassDB::bind_method(D_METHOD("is_hiding_enabled"), &TextEdit::is_hiding_enabled); ClassDB::bind_method(D_METHOD("is_hiding_enabled"), &TextEdit::is_hiding_enabled);
@ -6932,7 +6853,6 @@ void TextEdit::_bind_methods() {
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");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_tabs"), "set_draw_tabs", "is_drawing_tabs"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_tabs"), "set_draw_tabs", "is_drawing_tabs");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_spaces"), "set_draw_spaces", "is_drawing_spaces"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_spaces"), "set_draw_spaces", "is_drawing_spaces");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fold_gutter"), "set_draw_fold_gutter", "is_drawing_fold_gutter");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "highlight_all_occurrences"), "set_highlight_all_occurrences", "is_highlight_all_occurrences_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "highlight_all_occurrences"), "set_highlight_all_occurrences", "is_highlight_all_occurrences_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "override_selected_font_color"), "set_override_selected_font_color", "is_overriding_selected_font_color"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "override_selected_font_color"), "set_override_selected_font_color", "is_overriding_selected_font_color");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "context_menu_enabled"), "set_context_menu_enabled", "is_context_menu_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "context_menu_enabled"), "set_context_menu_enabled", "is_context_menu_enabled");
@ -6999,8 +6919,6 @@ TextEdit::TextEdit() {
_update_caches(); _update_caches();
cache.row_height = 1; cache.row_height = 1;
cache.line_spacing = 1; cache.line_spacing = 1;
cache.fold_gutter_width = 0;
fold_gutter_width = 0;
info_gutter_width = 0; info_gutter_width = 0;
cache.info_gutter_width = 0; cache.info_gutter_width = 0;
set_default_cursor_shape(CURSOR_IBEAM); set_default_cursor_shape(CURSOR_IBEAM);
@ -7069,7 +6987,6 @@ TextEdit::TextEdit() {
line_length_guidelines = false; line_length_guidelines = false;
line_length_guideline_soft_col = 80; line_length_guideline_soft_col = 80;
line_length_guideline_hard_col = 100; line_length_guideline_hard_col = 100;
draw_fold_gutter = false;
draw_info_gutter = false; draw_info_gutter = false;
hiding_enabled = false; hiding_enabled = false;
next_operation_is_complex = false; next_operation_is_complex = false;

12
scene/gui/text_edit.h
View File

@ -313,8 +313,6 @@ private:
bool line_length_guidelines; bool line_length_guidelines;
int line_length_guideline_soft_col; int line_length_guideline_soft_col;
int line_length_guideline_hard_col; int line_length_guideline_hard_col;
bool draw_fold_gutter;
int fold_gutter_width;
bool hiding_enabled; bool hiding_enabled;
bool draw_info_gutter; bool draw_info_gutter;
int info_gutter_width; int info_gutter_width;
@ -467,8 +465,6 @@ protected:
struct Cache { struct Cache {
Ref<Texture2D> tab_icon; Ref<Texture2D> tab_icon;
Ref<Texture2D> space_icon; Ref<Texture2D> space_icon;
Ref<Texture2D> can_fold_icon;
Ref<Texture2D> folded_icon;
Ref<Texture2D> folded_eol_icon; Ref<Texture2D> folded_eol_icon;
Ref<StyleBox> style_normal; Ref<StyleBox> style_normal;
Ref<StyleBox> style_focus; Ref<StyleBox> style_focus;
@ -497,13 +493,11 @@ protected:
int row_height; int row_height;
int line_spacing; int line_spacing;
int fold_gutter_width;
int info_gutter_width; int info_gutter_width;
int minimap_width; int minimap_width;
Cache() { Cache() {
row_height = 0; row_height = 0;
line_spacing = 0; line_spacing = 0;
fold_gutter_width = 0;
info_gutter_width = 0; info_gutter_width = 0;
minimap_width = 0; minimap_width = 0;
} }
@ -757,12 +751,6 @@ public:
void set_line_length_guideline_soft_column(int p_column); void set_line_length_guideline_soft_column(int p_column);
void set_line_length_guideline_hard_column(int p_column); void set_line_length_guideline_hard_column(int p_column);
void set_draw_fold_gutter(bool p_draw);
bool is_drawing_fold_gutter() const;
void set_fold_gutter_width(int p_gutter_width);
int get_fold_gutter_width() const;
void set_draw_info_gutter(bool p_draw); void set_draw_info_gutter(bool p_draw);
bool is_drawing_info_gutter() const; bool is_drawing_info_gutter() const;

5
scene/resources/default_theme/default_theme.cpp
View File

@ -382,8 +382,6 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
theme->set_icon("tab", "TextEdit", make_icon(tab_png)); theme->set_icon("tab", "TextEdit", make_icon(tab_png));
theme->set_icon("space", "TextEdit", make_icon(space_png)); theme->set_icon("space", "TextEdit", make_icon(space_png));
theme->set_icon("folded", "TextEdit", make_icon(arrow_right_png));
theme->set_icon("fold", "TextEdit", make_icon(arrow_down_png));
theme->set_font("font", "TextEdit", Ref<Font>()); theme->set_font("font", "TextEdit", Ref<Font>());
@ -422,8 +420,9 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
theme->set_icon("breakpoint", "CodeEdit", make_icon(graph_port_png)); theme->set_icon("breakpoint", "CodeEdit", make_icon(graph_port_png));
theme->set_icon("bookmark", "CodeEdit", make_icon(bookmark_png)); theme->set_icon("bookmark", "CodeEdit", make_icon(bookmark_png));
theme->set_icon("executing_line", "CodeEdit", make_icon(arrow_right_png)); theme->set_icon("executing_line", "CodeEdit", make_icon(arrow_right_png));
theme->set_icon("can_fold", "CodeEdit", make_icon(arrow_down_png));
theme->set_icon("folded", "CodeEdit", make_icon(arrow_right_png)); theme->set_icon("folded", "CodeEdit", make_icon(arrow_right_png));
theme->set_icon("fold", "CodeEdit", make_icon(arrow_down_png));
theme->set_font("font", "CodeEdit", Ref<Font>()); theme->set_font("font", "CodeEdit", Ref<Font>());
theme->set_color("background_color", "CodeEdit", Color(0, 0, 0, 0)); theme->set_color("background_color", "CodeEdit", Color(0, 0, 0, 0));