fd6453c45e
This reverts commit 4b817a565c.
Fixes #64988.
Fixes #64997.
This caused several regressions (#64988, #64997,
https://github.com/godotengine/godot/issues/64997#issuecomment-1229970605)
which point at a flaw in the current logic:
- `Control::NOTIFICATION_ENTER_TREE` triggers a *deferred* notification with
`NOTIFCATION_THEME_CHANGED` as introduced in #62845.
- Some classes use their `THEME_CHANGED` to cache theme items in
member variables (e.g. `style_normal`, etc.), and use those member
variables in `ENTER_TREE`, `READY`, `DRAW`, etc. Since the `THEME_CHANGE`
notification is now deferred, they end up accessing invalid state and this
can lead to not applying theme properly (e.g. for EditorHelp) or crashing
(e.g. for EditorLog or CodeEdit).
So we need to go back to the drawing board and see if `THEME_CHANGED` can be
called earlier so that the previous logic still works?
Or can we refactor all engine code to make sure that:
- `ENTER_TREE` and similar do not depend on theme properties cached in member
variables.
- Or `THEME_CHANGE` does trigger a general UI update to make sure that any
bad theme handling in `ENTER_TREE` and co. gets fixed when `THEME_CHANGE`
does arrive for the first time. But that means having a temporary invalid
(and possibly still crashing) state, and doing some computations twice
which might be heavy (e.g. `EditorHelp::_update_doc()`).
129 lines
5.1 KiB
C++
129 lines
5.1 KiB
C++
/*************************************************************************/
|
|
/* create_dialog.h */
|
|
/*************************************************************************/
|
|
/* This file is part of: */
|
|
/* GODOT ENGINE */
|
|
/* https://godotengine.org */
|
|
/*************************************************************************/
|
|
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
|
|
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
|
|
/* */
|
|
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
/* a copy of this software and associated documentation files (the */
|
|
/* "Software"), to deal in the Software without restriction, including */
|
|
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
/* the following conditions: */
|
|
/* */
|
|
/* The above copyright notice and this permission notice shall be */
|
|
/* included in all copies or substantial portions of the Software. */
|
|
/* */
|
|
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
|
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
/*************************************************************************/
|
|
|
|
#ifndef CREATE_DIALOG_H
|
|
#define CREATE_DIALOG_H
|
|
|
|
#include "editor/editor_help.h"
|
|
#include "scene/gui/button.h"
|
|
#include "scene/gui/dialogs.h"
|
|
#include "scene/gui/item_list.h"
|
|
#include "scene/gui/line_edit.h"
|
|
#include "scene/gui/tree.h"
|
|
|
|
class CreateDialog : public ConfirmationDialog {
|
|
GDCLASS(CreateDialog, ConfirmationDialog);
|
|
|
|
enum TypeCategory {
|
|
CPP_TYPE,
|
|
PATH_TYPE,
|
|
OTHER_TYPE
|
|
};
|
|
|
|
LineEdit *search_box = nullptr;
|
|
Tree *search_options = nullptr;
|
|
|
|
String base_type;
|
|
String icon_fallback;
|
|
String preferred_search_result_type;
|
|
|
|
Button *favorite = nullptr;
|
|
Vector<String> favorite_list;
|
|
Tree *favorites = nullptr;
|
|
ItemList *recent = nullptr;
|
|
EditorHelpBit *help_bit = nullptr;
|
|
|
|
HashMap<String, TreeItem *> search_options_types;
|
|
HashMap<String, String> custom_type_parents;
|
|
HashMap<String, int> custom_type_indices;
|
|
List<StringName> type_list;
|
|
HashSet<StringName> type_blacklist;
|
|
|
|
void _update_search();
|
|
bool _should_hide_type(const String &p_type) const;
|
|
void _add_type(const String &p_type, const TypeCategory p_type_category);
|
|
void _configure_search_option_item(TreeItem *r_item, const String &p_type, const TypeCategory p_type_category);
|
|
String _top_result(const Vector<String> p_candidates, const String &p_search_text) const;
|
|
float _score_type(const String &p_type, const String &p_search) const;
|
|
bool _is_type_preferred(const String &p_type) const;
|
|
|
|
void _fill_type_list();
|
|
void _cleanup();
|
|
|
|
void _sbox_input(const Ref<InputEvent> &p_ie);
|
|
void _text_changed(const String &p_newtext);
|
|
void select_type(const String &p_type, bool p_center_on_item = true);
|
|
void _item_selected();
|
|
void _hide_requested();
|
|
|
|
void _confirmed();
|
|
virtual void cancel_pressed() override;
|
|
|
|
void _favorite_toggled();
|
|
|
|
void _history_selected(int p_idx);
|
|
void _favorite_selected();
|
|
|
|
void _history_activated(int p_idx);
|
|
void _favorite_activated();
|
|
|
|
Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
|
|
bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
|
|
void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
|
|
|
|
bool _is_class_disabled_by_feature_profile(const StringName &p_class) const;
|
|
void _load_favorites_and_history();
|
|
|
|
void _update_theme();
|
|
|
|
protected:
|
|
void _notification(int p_what);
|
|
static void _bind_methods();
|
|
|
|
void _save_and_update_favorite_list();
|
|
|
|
public:
|
|
Variant instance_selected();
|
|
String get_selected_type();
|
|
|
|
void set_base_type(const String &p_base) { base_type = p_base; }
|
|
String get_base_type() const { return base_type; }
|
|
void select_base();
|
|
|
|
void set_preferred_search_result_type(const String &p_preferred_type) { preferred_search_result_type = p_preferred_type; }
|
|
String get_preferred_search_result_type() { return preferred_search_result_type; }
|
|
|
|
void popup_create(bool p_dont_clear, bool p_replace_mode = false, const String &p_select_type = "Node", const String &p_select_name = "");
|
|
|
|
CreateDialog();
|
|
};
|
|
|
|
#endif // CREATE_DIALOG_H
|