diff options
Diffstat (limited to 'scene/gui/text_edit.h')
| -rw-r--r-- | scene/gui/text_edit.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index 7d096f7897..ab78f77d94 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -39,7 +39,6 @@ class SyntaxHighlighter; class TextEdit : public Control { - GDCLASS(TextEdit, Control); public: @@ -48,7 +47,6 @@ public: }; struct ColorRegion { - Color color; String begin_key; String end_key; @@ -66,7 +64,6 @@ public: class Text { public: struct ColorRegionInfo { - int region; bool end; ColorRegionInfo() { @@ -168,7 +165,6 @@ private: } cursor; struct Selection { - enum Mode { MODE_NONE, @@ -207,7 +203,6 @@ private: } selection; struct Cache { - Ref<Texture2D> tab_icon; Ref<Texture2D> space_icon; Ref<Texture2D> can_fold_icon; @@ -256,7 +251,6 @@ private: int info_gutter_width; int minimap_width; Cache() { - row_height = 0; line_spacing = 0; line_number_w = 0; @@ -271,7 +265,6 @@ private: Map<int, Map<int, HighlighterInfo>> syntax_highlighting_cache; struct TextOperation { - enum Type { TYPE_NONE, TYPE_INSERT, @@ -306,6 +299,7 @@ private: List<TextOperation> undo_stack; List<TextOperation>::Element *undo_stack_pos; + int undo_stack_max_size; void _clear_redo(); void _do_text_op(const TextOperation &p_op, bool p_reverse); @@ -514,7 +508,7 @@ private: int _get_column_pos_of_word(const String &p_key, const String &p_search, uint32_t p_search_flags, int p_from_column); - Vector<int> _search_bind(const String &p_key, uint32_t p_search_flags, int p_from_line, int p_from_column) const; + Dictionary _search_bind(const String &p_key, uint32_t p_search_flags, int p_from_line, int p_from_column) const; PopupMenu *menu; @@ -530,7 +524,7 @@ private: protected: virtual String get_tooltip(const Point2 &p_pos) const; - void _insert_text(int p_line, int p_char, const String &p_text, int *r_end_line = NULL, int *r_end_char = NULL); + void _insert_text(int p_line, int p_char, const String &p_text, int *r_end_line = nullptr, int *r_end_char = nullptr); void _remove_text(int p_from_line, int p_from_column, int p_to_line, int p_to_column); void _insert_text_at_cursor(const String &p_text); void _gui_input(const Ref<InputEvent> &p_gui_input); @@ -567,11 +561,6 @@ public: SEARCH_BACKWARDS = 4 }; - enum SearchResult { - SEARCH_RESULT_COLUMN, - SEARCH_RESULT_LINE, - }; - 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; @@ -832,7 +821,6 @@ public: VARIANT_ENUM_CAST(TextEdit::MenuItems); VARIANT_ENUM_CAST(TextEdit::SearchFlags); -VARIANT_ENUM_CAST(TextEdit::SearchResult); class SyntaxHighlighter { protected: |