godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #50606 from Chaosus/textedit_fix_guttertype

Browse Source 
Fixed typos in `TextEdit::GutterType` enum
This commit is contained in:
Rémi Verschelde
2021-07-19 16:40:42 +02:00
committed by GitHub
parent 855c7c7414 1597045b09
commit dfc1ec7fb9
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/TextEdit.xml
View File

@@ -858,9 +858,9 @@
</constant> </constant>
<constant name="GUTTER_TYPE_STRING" value="0" enum="GutterType"> <constant name="GUTTER_TYPE_STRING" value="0" enum="GutterType">
</constant> </constant>
<constant name="GUTTER_TPYE_ICON" value="1" enum="GutterType"> <constant name="GUTTER_TYPE_ICON" value="1" enum="GutterType">
</constant> </constant>
<constant name="GUTTER_TPYE_CUSTOM" value="2" enum="GutterType"> <constant name="GUTTER_TYPE_CUSTOM" value="2" enum="GutterType">
</constant> </constant>
<constant name="MENU_CUT" value="0" enum="MenuItems"> <constant name="MENU_CUT" value="0" enum="MenuItems">
Cuts (copies and clears) the selected text. Cuts (copies and clears) the selected text.

2
editor/plugins/script_text_editor.cpp
View File

@@ -1819,7 +1819,7 @@ ScriptTextEditor::ScriptTextEditor() {
code_editor->get_text_editor()->set_gutter_name(connection_gutter, "connection_gutter"); code_editor->get_text_editor()->set_gutter_name(connection_gutter, "connection_gutter");
code_editor->get_text_editor()->set_gutter_draw(connection_gutter, false); code_editor->get_text_editor()->set_gutter_draw(connection_gutter, false);
code_editor->get_text_editor()->set_gutter_overwritable(connection_gutter, true); code_editor->get_text_editor()->set_gutter_overwritable(connection_gutter, true);
code_editor->get_text_editor()->set_gutter_type(connection_gutter, TextEdit::GUTTER_TPYE_ICON); code_editor->get_text_editor()->set_gutter_type(connection_gutter, TextEdit::GUTTER_TYPE_ICON);
warnings_panel = memnew(RichTextLabel); warnings_panel = memnew(RichTextLabel);
warnings_panel->set_custom_minimum_size(Size2(0, 100 * EDSCALE)); warnings_panel->set_custom_minimum_size(Size2(0, 100 * EDSCALE));

6
scene/gui/code_edit.cpp
View File

@@ -2562,7 +2562,7 @@ CodeEdit::CodeEdit() {
set_gutter_name(gutter_idx, "main_gutter"); set_gutter_name(gutter_idx, "main_gutter");
set_gutter_draw(gutter_idx, false); set_gutter_draw(gutter_idx, false);
set_gutter_overwritable(gutter_idx, true); set_gutter_overwritable(gutter_idx, true);
set_gutter_type(gutter_idx, GUTTER_TPYE_CUSTOM); set_gutter_type(gutter_idx, GUTTER_TYPE_CUSTOM);
set_gutter_custom_draw(gutter_idx, this, "_main_gutter_draw_callback"); set_gutter_custom_draw(gutter_idx, this, "_main_gutter_draw_callback");
gutter_idx++; gutter_idx++;
@@ -2570,7 +2570,7 @@ CodeEdit::CodeEdit() {
add_gutter(); add_gutter();
set_gutter_name(gutter_idx, "line_numbers"); set_gutter_name(gutter_idx, "line_numbers");
set_gutter_draw(gutter_idx, false); set_gutter_draw(gutter_idx, false);
set_gutter_type(gutter_idx, GUTTER_TPYE_CUSTOM); set_gutter_type(gutter_idx, GUTTER_TYPE_CUSTOM);
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++;
@@ -2578,7 +2578,7 @@ CodeEdit::CodeEdit() {
add_gutter(); add_gutter();
set_gutter_name(gutter_idx, "fold_gutter"); set_gutter_name(gutter_idx, "fold_gutter");
set_gutter_draw(gutter_idx, false); set_gutter_draw(gutter_idx, false);
set_gutter_type(gutter_idx, GUTTER_TPYE_CUSTOM); set_gutter_type(gutter_idx, GUTTER_TYPE_CUSTOM);
set_gutter_custom_draw(gutter_idx, this, "_fold_gutter_draw_callback"); set_gutter_custom_draw(gutter_idx, this, "_fold_gutter_draw_callback");
gutter_idx++; gutter_idx++;

8
scene/gui/text_edit.cpp
View File

@@ -1119,7 +1119,7 @@ void TextEdit::_notification(int p_what) {
} }
tl->draw(ci, Point2(gutter_offset + ofs_x, yofs), get_line_gutter_item_color(line, g)); tl->draw(ci, Point2(gutter_offset + ofs_x, yofs), get_line_gutter_item_color(line, g));
} break; } break;
case GUTTER_TPYE_ICON: { case GUTTER_TYPE_ICON: {
const Ref<Texture2D> icon = get_line_gutter_icon(line, g); const Ref<Texture2D> icon = get_line_gutter_icon(line, g);
if (icon.is_null()) { if (icon.is_null()) {
break; break;
@@ -1147,7 +1147,7 @@ void TextEdit::_notification(int p_what) {
icon->draw_rect(ci, gutter_rect, false, get_line_gutter_item_color(line, g)); icon->draw_rect(ci, gutter_rect, false, get_line_gutter_item_color(line, g));
} break; } break;
case GUTTER_TPYE_CUSTOM: { case GUTTER_TYPE_CUSTOM: {
if (gutter.custom_draw_obj.is_valid()) { if (gutter.custom_draw_obj.is_valid()) {
Object *cdo = ObjectDB::get_instance(gutter.custom_draw_obj); Object *cdo = ObjectDB::get_instance(gutter.custom_draw_obj);
if (cdo) { if (cdo) {
@@ -5794,8 +5794,8 @@ void TextEdit::_bind_methods() {
/* Gutters. */ /* Gutters. */
BIND_ENUM_CONSTANT(GUTTER_TYPE_STRING); BIND_ENUM_CONSTANT(GUTTER_TYPE_STRING);
BIND_ENUM_CONSTANT(GUTTER_TPYE_ICON); BIND_ENUM_CONSTANT(GUTTER_TYPE_ICON);
BIND_ENUM_CONSTANT(GUTTER_TPYE_CUSTOM); BIND_ENUM_CONSTANT(GUTTER_TYPE_CUSTOM);
ClassDB::bind_method(D_METHOD("add_gutter", "at"), &TextEdit::add_gutter, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("add_gutter", "at"), &TextEdit::add_gutter, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("remove_gutter", "gutter"), &TextEdit::remove_gutter); ClassDB::bind_method(D_METHOD("remove_gutter", "gutter"), &TextEdit::remove_gutter);

4
scene/gui/text_edit.h
View File

@@ -44,8 +44,8 @@ class TextEdit : public Control {
public: public:
enum GutterType { enum GutterType {
GUTTER_TYPE_STRING, GUTTER_TYPE_STRING,
GUTTER_TPYE_ICON, GUTTER_TYPE_ICON,
GUTTER_TPYE_CUSTOM GUTTER_TYPE_CUSTOM
}; };
enum SelectionMode { enum SelectionMode {