diff options
Diffstat (limited to 'scene/gui/tree.h')
| -rw-r--r-- | scene/gui/tree.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 87c2588a12..c0910a8fe0 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -40,7 +40,6 @@ class Tree; class TreeItem : public Object { - GDCLASS(TreeItem, Object); public: @@ -63,7 +62,6 @@ private: friend class Tree; struct Cell { - TreeCellMode mode; Ref<Texture2D> icon; @@ -111,7 +109,6 @@ private: Vector<Button> buttons; Cell() { - custom_draw_obj = ObjectID(); custom_button = false; mode = TreeItem::CELL_MODE_STRING; @@ -293,7 +290,6 @@ VARIANT_ENUM_CAST(TreeItem::TextAlign); class VBoxContainer; class Tree : public Control { - GDCLASS(Tree, Control); public: @@ -350,7 +346,6 @@ private: int drop_mode_flags; struct ColumnInfo { - int min_width; bool expand; String title; @@ -364,11 +359,11 @@ private: VBoxContainer *popup_editor_vb; - PopupPanel *popup_editor; + Popup *popup_editor; LineEdit *text_editor; HSlider *value_editor; bool updating_value_editor; - int64_t focus_in_id; + uint64_t focus_in_id; PopupMenu *popup_menu; Vector<ColumnInfo> columns; @@ -394,7 +389,7 @@ private: void _gui_input(Ref<InputEvent> p_event); void _notification(int p_what); - Size2 get_minimum_size() const; + Size2 get_minimum_size() const override; void item_edited(int p_column, TreeItem *p_item, bool p_lmb = true); void item_changed(int p_column, TreeItem *p_item); @@ -404,7 +399,6 @@ private: void propagate_set_columns(TreeItem *p_item); struct Cache { - Ref<Font> font; Ref<Font> tb_font; Ref<StyleBox> bg; @@ -536,15 +530,16 @@ protected: } public: - virtual String get_tooltip(const Point2 &p_pos) const; + virtual String get_tooltip(const Point2 &p_pos) const override; TreeItem *get_item_at_position(const Point2 &p_pos) const; int get_column_at_position(const Point2 &p_pos) const; int get_drop_section_at_position(const Point2 &p_pos) const; + int get_button_id_at_position(const Point2 &p_pos) const; void clear(); - TreeItem *create_item(TreeItem *p_parent = 0, int p_idx = -1); + TreeItem *create_item(TreeItem *p_parent = nullptr, int p_idx = -1); TreeItem *get_root(); TreeItem *get_last_item(); |