Merge pull request #58338 from aaronfranke/bools
Initialize bools in the headers in `editor/`
This commit is contained in:
commit
84b358c1d8
@ -1122,8 +1122,6 @@ void ActionMapEditor::use_external_search_box(LineEdit *p_searchbox) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ActionMapEditor::ActionMapEditor() {
|
ActionMapEditor::ActionMapEditor() {
|
||||||
show_builtin_actions = false;
|
|
||||||
|
|
||||||
// Main Vbox Container
|
// Main Vbox Container
|
||||||
VBoxContainer *main_vbox = memnew(VBoxContainer);
|
VBoxContainer *main_vbox = memnew(VBoxContainer);
|
||||||
main_vbox->set_anchors_and_offsets_preset(PRESET_WIDE);
|
main_vbox->set_anchors_and_offsets_preset(PRESET_WIDE);
|
||||||
|
@ -164,7 +164,7 @@ private:
|
|||||||
|
|
||||||
// Filtering and Adding actions
|
// Filtering and Adding actions
|
||||||
|
|
||||||
bool show_builtin_actions;
|
bool show_builtin_actions = false;
|
||||||
CheckButton *show_builtin_actions_checkbutton;
|
CheckButton *show_builtin_actions_checkbutton;
|
||||||
LineEdit *action_list_search;
|
LineEdit *action_list_search;
|
||||||
|
|
||||||
|
@ -1886,8 +1886,6 @@ void AnimationTimelineEdit::_bind_methods() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AnimationTimelineEdit::AnimationTimelineEdit() {
|
AnimationTimelineEdit::AnimationTimelineEdit() {
|
||||||
use_fps = false;
|
|
||||||
editing = false;
|
|
||||||
name_limit = 150 * EDSCALE;
|
name_limit = 150 * EDSCALE;
|
||||||
zoom = nullptr;
|
zoom = nullptr;
|
||||||
track_edit = nullptr;
|
track_edit = nullptr;
|
||||||
@ -1935,9 +1933,6 @@ AnimationTimelineEdit::AnimationTimelineEdit() {
|
|||||||
add_track->get_popup()->connect("index_pressed", callable_mp(this, &AnimationTimelineEdit::_track_added));
|
add_track->get_popup()->connect("index_pressed", callable_mp(this, &AnimationTimelineEdit::_track_added));
|
||||||
len_hb->hide();
|
len_hb->hide();
|
||||||
|
|
||||||
dragging_timeline = false;
|
|
||||||
dragging_hsize = false;
|
|
||||||
|
|
||||||
panner.instantiate();
|
panner.instantiate();
|
||||||
panner->set_callbacks(callable_mp(this, &AnimationTimelineEdit::_scroll_callback), callable_mp(this, &AnimationTimelineEdit::_pan_callback), callable_mp(this, &AnimationTimelineEdit::_zoom_callback));
|
panner->set_callbacks(callable_mp(this, &AnimationTimelineEdit::_scroll_callback), callable_mp(this, &AnimationTimelineEdit::_pan_callback), callable_mp(this, &AnimationTimelineEdit::_zoom_callback));
|
||||||
|
|
||||||
@ -3151,13 +3146,8 @@ AnimationTrackEdit::AnimationTrackEdit() {
|
|||||||
path = nullptr;
|
path = nullptr;
|
||||||
path_popup = nullptr;
|
path_popup = nullptr;
|
||||||
menu = nullptr;
|
menu = nullptr;
|
||||||
clicking_on_name = false;
|
|
||||||
dropping_at = 0;
|
dropping_at = 0;
|
||||||
|
|
||||||
in_group = false;
|
|
||||||
|
|
||||||
moving_selection_attempt = false;
|
|
||||||
moving_selection = false;
|
|
||||||
select_single_attempt = -1;
|
select_single_attempt = -1;
|
||||||
|
|
||||||
play_position_pos = 0;
|
play_position_pos = 0;
|
||||||
@ -6316,8 +6306,6 @@ AnimationTrackEditor::AnimationTrackEditor() {
|
|||||||
add_child(method_selector);
|
add_child(method_selector);
|
||||||
method_selector->connect("selected", callable_mp(this, &AnimationTrackEditor::_add_method_key));
|
method_selector->connect("selected", callable_mp(this, &AnimationTrackEditor::_add_method_key));
|
||||||
|
|
||||||
insert_queue = false;
|
|
||||||
|
|
||||||
insert_confirm = memnew(ConfirmationDialog);
|
insert_confirm = memnew(ConfirmationDialog);
|
||||||
add_child(insert_confirm);
|
add_child(insert_confirm);
|
||||||
insert_confirm->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_confirm_insert_list));
|
insert_confirm->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_confirm_insert_list));
|
||||||
@ -6335,8 +6323,6 @@ AnimationTrackEditor::AnimationTrackEditor() {
|
|||||||
insert_confirm_reset->set_text(TTR("Create RESET Track(s)", ""));
|
insert_confirm_reset->set_text(TTR("Create RESET Track(s)", ""));
|
||||||
insert_confirm_reset->set_pressed(EDITOR_GET("editors/animation/default_create_reset_tracks"));
|
insert_confirm_reset->set_pressed(EDITOR_GET("editors/animation/default_create_reset_tracks"));
|
||||||
ichb->add_child(insert_confirm_reset);
|
ichb->add_child(insert_confirm_reset);
|
||||||
keying = false;
|
|
||||||
moving_selection = false;
|
|
||||||
key_edit = nullptr;
|
key_edit = nullptr;
|
||||||
multi_key_edit = nullptr;
|
multi_key_edit = nullptr;
|
||||||
|
|
||||||
@ -6346,7 +6332,6 @@ AnimationTrackEditor::AnimationTrackEditor() {
|
|||||||
box_selection->set_mouse_filter(MOUSE_FILTER_IGNORE);
|
box_selection->set_mouse_filter(MOUSE_FILTER_IGNORE);
|
||||||
box_selection->hide();
|
box_selection->hide();
|
||||||
box_selection->connect("draw", callable_mp(this, &AnimationTrackEditor::_box_selection_draw));
|
box_selection->connect("draw", callable_mp(this, &AnimationTrackEditor::_box_selection_draw));
|
||||||
box_selecting = false;
|
|
||||||
|
|
||||||
// Default Plugins.
|
// Default Plugins.
|
||||||
|
|
||||||
@ -6443,7 +6428,6 @@ AnimationTrackEditor::AnimationTrackEditor() {
|
|||||||
track_copy_select->set_hide_root(true);
|
track_copy_select->set_hide_root(true);
|
||||||
track_vbox->add_child(track_copy_select);
|
track_vbox->add_child(track_copy_select);
|
||||||
track_copy_dialog->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed), varray(EDIT_COPY_TRACKS_CONFIRM));
|
track_copy_dialog->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed), varray(EDIT_COPY_TRACKS_CONFIRM));
|
||||||
animation_changing_awaiting_update = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AnimationTrackEditor::~AnimationTrackEditor() {
|
AnimationTrackEditor::~AnimationTrackEditor() {
|
||||||
|
@ -77,16 +77,16 @@ class AnimationTimelineEdit : public Range {
|
|||||||
UndoRedo *undo_redo;
|
UndoRedo *undo_redo;
|
||||||
Rect2 hsize_rect;
|
Rect2 hsize_rect;
|
||||||
|
|
||||||
bool editing;
|
bool editing = false;
|
||||||
bool use_fps;
|
bool use_fps = false;
|
||||||
|
|
||||||
Ref<ViewPanner> panner;
|
Ref<ViewPanner> panner;
|
||||||
void _scroll_callback(Vector2 p_scroll_vec, bool p_alt);
|
void _scroll_callback(Vector2 p_scroll_vec, bool p_alt);
|
||||||
void _pan_callback(Vector2 p_scroll_vec);
|
void _pan_callback(Vector2 p_scroll_vec);
|
||||||
void _zoom_callback(Vector2 p_scroll_vec, Vector2 p_origin, bool p_alt);
|
void _zoom_callback(Vector2 p_scroll_vec, Vector2 p_origin, bool p_alt);
|
||||||
|
|
||||||
bool dragging_timeline;
|
bool dragging_timeline = false;
|
||||||
bool dragging_hsize;
|
bool dragging_hsize = false;
|
||||||
float dragging_hsize_from;
|
float dragging_hsize_from;
|
||||||
float dragging_hsize_at;
|
float dragging_hsize_at;
|
||||||
|
|
||||||
@ -171,7 +171,7 @@ class AnimationTrackEdit : public Control {
|
|||||||
|
|
||||||
PopupMenu *menu;
|
PopupMenu *menu;
|
||||||
|
|
||||||
bool clicking_on_name;
|
bool clicking_on_name = false;
|
||||||
|
|
||||||
void _zoom_changed();
|
void _zoom_changed();
|
||||||
|
|
||||||
@ -188,12 +188,12 @@ class AnimationTrackEdit : public Control {
|
|||||||
|
|
||||||
mutable int dropping_at;
|
mutable int dropping_at;
|
||||||
float insert_at_pos;
|
float insert_at_pos;
|
||||||
bool moving_selection_attempt;
|
bool moving_selection_attempt = false;
|
||||||
int select_single_attempt;
|
int select_single_attempt;
|
||||||
bool moving_selection;
|
bool moving_selection = false;
|
||||||
float moving_selection_from_ofs;
|
float moving_selection_from_ofs;
|
||||||
|
|
||||||
bool in_group;
|
bool in_group = false;
|
||||||
AnimationTrackEditor *editor;
|
AnimationTrackEditor *editor;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -312,7 +312,7 @@ class AnimationTrackEditor : public VBoxContainer {
|
|||||||
Vector<AnimationTrackEdit *> track_edits;
|
Vector<AnimationTrackEdit *> track_edits;
|
||||||
Vector<AnimationTrackEditGroup *> groups;
|
Vector<AnimationTrackEditGroup *> groups;
|
||||||
|
|
||||||
bool animation_changing_awaiting_update;
|
bool animation_changing_awaiting_update = false;
|
||||||
void _animation_update();
|
void _animation_update();
|
||||||
int _get_track_selected();
|
int _get_track_selected();
|
||||||
void _animation_changed();
|
void _animation_changed();
|
||||||
@ -342,7 +342,7 @@ class AnimationTrackEditor : public VBoxContainer {
|
|||||||
int adding_track_type;
|
int adding_track_type;
|
||||||
NodePath adding_track_path;
|
NodePath adding_track_path;
|
||||||
|
|
||||||
bool keying;
|
bool keying = false;
|
||||||
|
|
||||||
struct InsertData {
|
struct InsertData {
|
||||||
Animation::TrackType type;
|
Animation::TrackType type;
|
||||||
@ -357,7 +357,7 @@ class AnimationTrackEditor : public VBoxContainer {
|
|||||||
CheckBox *insert_confirm_bezier;
|
CheckBox *insert_confirm_bezier;
|
||||||
CheckBox *insert_confirm_reset;
|
CheckBox *insert_confirm_reset;
|
||||||
ConfirmationDialog *insert_confirm;
|
ConfirmationDialog *insert_confirm;
|
||||||
bool insert_queue;
|
bool insert_queue = false;
|
||||||
List<InsertData> insert_data;
|
List<InsertData> insert_data;
|
||||||
|
|
||||||
void _query_insert(const InsertData &p_id);
|
void _query_insert(const InsertData &p_id);
|
||||||
@ -412,7 +412,7 @@ class AnimationTrackEditor : public VBoxContainer {
|
|||||||
void _key_selected(int p_key, bool p_single, int p_track);
|
void _key_selected(int p_key, bool p_single, int p_track);
|
||||||
void _key_deselected(int p_key, int p_track);
|
void _key_deselected(int p_key, int p_track);
|
||||||
|
|
||||||
bool moving_selection;
|
bool moving_selection = false;
|
||||||
float moving_selection_offset;
|
float moving_selection_offset;
|
||||||
void _move_selection_begin();
|
void _move_selection_begin();
|
||||||
void _move_selection(float p_offset);
|
void _move_selection(float p_offset);
|
||||||
@ -427,7 +427,7 @@ class AnimationTrackEditor : public VBoxContainer {
|
|||||||
|
|
||||||
Control *box_selection;
|
Control *box_selection;
|
||||||
void _box_selection_draw();
|
void _box_selection_draw();
|
||||||
bool box_selecting;
|
bool box_selecting = false;
|
||||||
Vector2 box_selecting_from;
|
Vector2 box_selecting_from;
|
||||||
Rect2 box_select_rect;
|
Rect2 box_select_rect;
|
||||||
void _scroll_input(const Ref<InputEvent> &p_event);
|
void _scroll_input(const Ref<InputEvent> &p_event);
|
||||||
|
@ -1119,7 +1119,6 @@ void AnimationTrackEditTypeAudio::gui_input(const Ref<InputEvent> &p_event) {
|
|||||||
get_undo_redo()->commit_action();
|
get_undo_redo()->commit_action();
|
||||||
}
|
}
|
||||||
|
|
||||||
len_resizing = false;
|
|
||||||
len_resizing_index = -1;
|
len_resizing_index = -1;
|
||||||
update();
|
update();
|
||||||
accept_event();
|
accept_event();
|
||||||
|
@ -81,7 +81,7 @@ class AnimationTrackEditSpriteFrame : public AnimationTrackEdit {
|
|||||||
GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit);
|
GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit);
|
||||||
|
|
||||||
ObjectID id;
|
ObjectID id;
|
||||||
bool is_coords;
|
bool is_coords = false;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual int get_key_height() const override;
|
virtual int get_key_height() const override;
|
||||||
@ -92,7 +92,7 @@ public:
|
|||||||
void set_node(Object *p_object);
|
void set_node(Object *p_object);
|
||||||
void set_as_coords();
|
void set_as_coords();
|
||||||
|
|
||||||
AnimationTrackEditSpriteFrame() { is_coords = false; }
|
AnimationTrackEditSpriteFrame() {}
|
||||||
};
|
};
|
||||||
|
|
||||||
class AnimationTrackEditSubAnim : public AnimationTrackEdit {
|
class AnimationTrackEditSubAnim : public AnimationTrackEdit {
|
||||||
@ -114,7 +114,7 @@ class AnimationTrackEditTypeAudio : public AnimationTrackEdit {
|
|||||||
|
|
||||||
void _preview_changed(ObjectID p_which);
|
void _preview_changed(ObjectID p_which);
|
||||||
|
|
||||||
bool len_resizing;
|
bool len_resizing = false;
|
||||||
bool len_resizing_start;
|
bool len_resizing_start;
|
||||||
int len_resizing_index;
|
int len_resizing_index;
|
||||||
float len_resizing_from_px;
|
float len_resizing_from_px;
|
||||||
|
@ -618,8 +618,6 @@ void FindReplaceBar::_bind_methods() {
|
|||||||
|
|
||||||
FindReplaceBar::FindReplaceBar() {
|
FindReplaceBar::FindReplaceBar() {
|
||||||
results_count = -1;
|
results_count = -1;
|
||||||
replace_all_mode = false;
|
|
||||||
preserve_cursor = false;
|
|
||||||
|
|
||||||
vbc_lineedit = memnew(VBoxContainer);
|
vbc_lineedit = memnew(VBoxContainer);
|
||||||
add_child(vbc_lineedit);
|
add_child(vbc_lineedit);
|
||||||
@ -1887,8 +1885,6 @@ CodeTextEditor::CodeTextEditor() {
|
|||||||
error_button->set_default_cursor_shape(CURSOR_POINTING_HAND);
|
error_button->set_default_cursor_shape(CURSOR_POINTING_HAND);
|
||||||
error_button->connect("pressed", callable_mp(this, &CodeTextEditor::_error_button_pressed));
|
error_button->connect("pressed", callable_mp(this, &CodeTextEditor::_error_button_pressed));
|
||||||
error_button->set_tooltip(TTR("Errors"));
|
error_button->set_tooltip(TTR("Errors"));
|
||||||
|
|
||||||
is_errors_panel_opened = false;
|
|
||||||
set_error_count(0);
|
set_error_count(0);
|
||||||
|
|
||||||
// Warnings
|
// Warnings
|
||||||
@ -1899,8 +1895,6 @@ CodeTextEditor::CodeTextEditor() {
|
|||||||
warning_button->set_default_cursor_shape(CURSOR_POINTING_HAND);
|
warning_button->set_default_cursor_shape(CURSOR_POINTING_HAND);
|
||||||
warning_button->connect("pressed", callable_mp(this, &CodeTextEditor::_warning_button_pressed));
|
warning_button->connect("pressed", callable_mp(this, &CodeTextEditor::_warning_button_pressed));
|
||||||
warning_button->set_tooltip(TTR("Warnings"));
|
warning_button->set_tooltip(TTR("Warnings"));
|
||||||
|
|
||||||
is_warnings_panel_opened = false;
|
|
||||||
set_warning_count(0);
|
set_warning_count(0);
|
||||||
|
|
||||||
// Line and column
|
// Line and column
|
||||||
|
@ -86,8 +86,8 @@ class FindReplaceBar : public HBoxContainer {
|
|||||||
int result_col;
|
int result_col;
|
||||||
int results_count;
|
int results_count;
|
||||||
|
|
||||||
bool replace_all_mode;
|
bool replace_all_mode = false;
|
||||||
bool preserve_cursor;
|
bool preserve_cursor = false;
|
||||||
|
|
||||||
void _get_search_from(int &r_line, int &r_col);
|
void _get_search_from(int &r_line, int &r_col);
|
||||||
void _update_results_count();
|
void _update_results_count();
|
||||||
@ -206,8 +206,8 @@ protected:
|
|||||||
void _notification(int);
|
void _notification(int);
|
||||||
static void _bind_methods();
|
static void _bind_methods();
|
||||||
|
|
||||||
bool is_warnings_panel_opened;
|
bool is_warnings_panel_opened = false;
|
||||||
bool is_errors_panel_opened;
|
bool is_errors_panel_opened = false;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void trim_trailing_whitespace();
|
void trim_trailing_whitespace();
|
||||||
|
@ -356,7 +356,5 @@ EditorAssetInstaller::EditorAssetInstaller() {
|
|||||||
get_ok_button()->set_text(TTR("Install"));
|
get_ok_button()->set_text(TTR("Install"));
|
||||||
set_title(TTR("Asset Installer"));
|
set_title(TTR("Asset Installer"));
|
||||||
|
|
||||||
updating = false;
|
|
||||||
|
|
||||||
set_hide_on_ok(true);
|
set_hide_on_ok(true);
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ class EditorAssetInstaller : public ConfirmationDialog {
|
|||||||
String asset_name;
|
String asset_name;
|
||||||
AcceptDialog *error;
|
AcceptDialog *error;
|
||||||
Map<String, TreeItem *> status_map;
|
Map<String, TreeItem *> status_map;
|
||||||
bool updating;
|
bool updating = false;
|
||||||
void _item_edited();
|
void _item_edited();
|
||||||
void _check_propagated_to_item(Object *p_obj, int column);
|
void _check_propagated_to_item(Object *p_obj, int column);
|
||||||
virtual void ok_pressed() override;
|
virtual void ok_pressed() override;
|
||||||
|
@ -771,9 +771,7 @@ void EditorAudioBus::_bind_methods() {
|
|||||||
|
|
||||||
EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
|
EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
|
||||||
buses = p_buses;
|
buses = p_buses;
|
||||||
updating_bus = false;
|
|
||||||
is_master = p_is_master;
|
is_master = p_is_master;
|
||||||
hovering_drop = false;
|
|
||||||
|
|
||||||
set_tooltip(TTR("Drag & drop to rearrange."));
|
set_tooltip(TTR("Drag & drop to rearrange."));
|
||||||
|
|
||||||
@ -992,7 +990,6 @@ void EditorAudioBusDrop::_bind_methods() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditorAudioBusDrop::EditorAudioBusDrop() {
|
EditorAudioBusDrop::EditorAudioBusDrop() {
|
||||||
hovering_drop = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void EditorAudioBuses::_update_buses() {
|
void EditorAudioBuses::_update_buses() {
|
||||||
|
@ -85,9 +85,9 @@ class EditorAudioBus : public PanelContainer {
|
|||||||
|
|
||||||
Tree *effects;
|
Tree *effects;
|
||||||
|
|
||||||
bool updating_bus;
|
bool updating_bus = false;
|
||||||
bool is_master;
|
bool is_master;
|
||||||
mutable bool hovering_drop;
|
mutable bool hovering_drop = false;
|
||||||
|
|
||||||
virtual void gui_input(const Ref<InputEvent> &p_event) override;
|
virtual void gui_input(const Ref<InputEvent> &p_event) override;
|
||||||
void _effects_gui_input(Ref<InputEvent> p_event);
|
void _effects_gui_input(Ref<InputEvent> p_event);
|
||||||
@ -140,7 +140,7 @@ class EditorAudioBusDrop : public Control {
|
|||||||
virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
|
virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
|
||||||
virtual void drop_data(const Point2 &p_point, const Variant &p_data) override;
|
virtual void drop_data(const Point2 &p_point, const Variant &p_data) override;
|
||||||
|
|
||||||
mutable bool hovering_drop;
|
mutable bool hovering_drop = false;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static void _bind_methods();
|
static void _bind_methods();
|
||||||
|
@ -1206,9 +1206,6 @@ void EditorSelection::clear() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditorSelection::EditorSelection() {
|
EditorSelection::EditorSelection() {
|
||||||
emitted = false;
|
|
||||||
changed = false;
|
|
||||||
nl_changed = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EditorSelection::~EditorSelection() {
|
EditorSelection::~EditorSelection() {
|
||||||
|
@ -239,9 +239,9 @@ class EditorSelection : public Object {
|
|||||||
private:
|
private:
|
||||||
Map<Node *, Object *> selection;
|
Map<Node *, Object *> selection;
|
||||||
|
|
||||||
bool emitted;
|
bool emitted = false;
|
||||||
bool changed;
|
bool changed = false;
|
||||||
bool nl_changed;
|
bool nl_changed = false;
|
||||||
|
|
||||||
void _node_removed(Node *p_node);
|
void _node_removed(Node *p_node);
|
||||||
|
|
||||||
|
@ -175,8 +175,6 @@ void EditorDirDialog::_bind_methods() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditorDirDialog::EditorDirDialog() {
|
EditorDirDialog::EditorDirDialog() {
|
||||||
updating = false;
|
|
||||||
|
|
||||||
set_title(TTR("Choose a Directory"));
|
set_title(TTR("Choose a Directory"));
|
||||||
set_hide_on_ok(false);
|
set_hide_on_ok(false);
|
||||||
|
|
||||||
@ -206,6 +204,4 @@ EditorDirDialog::EditorDirDialog() {
|
|||||||
add_child(mkdirerr);
|
add_child(mkdirerr);
|
||||||
|
|
||||||
get_ok_button()->set_text(TTR("Choose"));
|
get_ok_button()->set_text(TTR("Choose"));
|
||||||
|
|
||||||
must_reload = false;
|
|
||||||
}
|
}
|
||||||
|
@ -47,7 +47,7 @@ class EditorDirDialog : public ConfirmationDialog {
|
|||||||
Set<String> opened_paths;
|
Set<String> opened_paths;
|
||||||
|
|
||||||
Tree *tree;
|
Tree *tree;
|
||||||
bool updating;
|
bool updating = false;
|
||||||
|
|
||||||
void _item_collapsed(Object *p_item);
|
void _item_collapsed(Object *p_item);
|
||||||
void _item_activated();
|
void _item_activated();
|
||||||
@ -58,7 +58,7 @@ class EditorDirDialog : public ConfirmationDialog {
|
|||||||
|
|
||||||
void ok_pressed() override;
|
void ok_pressed() override;
|
||||||
|
|
||||||
bool must_reload;
|
bool must_reload = false;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void _notification(int p_what);
|
void _notification(int p_what);
|
||||||
|
@ -678,7 +678,6 @@ void EditorExportPlugin::_bind_methods() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditorExportPlugin::EditorExportPlugin() {
|
EditorExportPlugin::EditorExportPlugin() {
|
||||||
skipped = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EditorExportPlatform::FeatureContainers EditorExportPlatform::get_feature_containers(const Ref<EditorExportPreset> &p_preset) {
|
EditorExportPlatform::FeatureContainers EditorExportPlatform::get_feature_containers(const Ref<EditorExportPreset> &p_preset) {
|
||||||
@ -1722,7 +1721,6 @@ EditorExport::EditorExport() {
|
|||||||
save_timer->set_wait_time(0.8);
|
save_timer->set_wait_time(0.8);
|
||||||
save_timer->set_one_shot(true);
|
save_timer->set_one_shot(true);
|
||||||
save_timer->connect("timeout", callable_mp(this, &EditorExport::_save));
|
save_timer->connect("timeout", callable_mp(this, &EditorExport::_save));
|
||||||
block_save = false;
|
|
||||||
|
|
||||||
_export_presets_updated = "export_presets_updated";
|
_export_presets_updated = "export_presets_updated";
|
||||||
|
|
||||||
|
@ -297,7 +297,7 @@ class EditorExportPlugin : public RefCounted {
|
|||||||
bool remap = false;
|
bool remap = false;
|
||||||
};
|
};
|
||||||
Vector<ExtraFile> extra_files;
|
Vector<ExtraFile> extra_files;
|
||||||
bool skipped;
|
bool skipped = false;
|
||||||
|
|
||||||
Vector<String> ios_frameworks;
|
Vector<String> ios_frameworks;
|
||||||
Vector<String> ios_embedded_frameworks;
|
Vector<String> ios_embedded_frameworks;
|
||||||
@ -379,7 +379,7 @@ class EditorExport : public Node {
|
|||||||
StringName _export_presets_updated;
|
StringName _export_presets_updated;
|
||||||
|
|
||||||
Timer *save_timer;
|
Timer *save_timer;
|
||||||
bool block_save;
|
bool block_save = false;
|
||||||
|
|
||||||
static EditorExport *singleton;
|
static EditorExport *singleton;
|
||||||
|
|
||||||
|
@ -1010,7 +1010,5 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() {
|
|||||||
update_timer->connect("timeout", callable_mp(this, &EditorFeatureProfileManager::_emit_current_profile_changed));
|
update_timer->connect("timeout", callable_mp(this, &EditorFeatureProfileManager::_emit_current_profile_changed));
|
||||||
update_timer->set_one_shot(true);
|
update_timer->set_one_shot(true);
|
||||||
|
|
||||||
updating_features = false;
|
|
||||||
|
|
||||||
singleton = this;
|
singleton = this;
|
||||||
}
|
}
|
||||||
|
@ -155,7 +155,7 @@ class EditorFeatureProfileManager : public AcceptDialog {
|
|||||||
void _import_profiles(const Vector<String> &p_paths);
|
void _import_profiles(const Vector<String> &p_paths);
|
||||||
void _export_profile(const String &p_path);
|
void _export_profile(const String &p_path);
|
||||||
|
|
||||||
bool updating_features;
|
bool updating_features = false;
|
||||||
|
|
||||||
void _class_list_item_selected();
|
void _class_list_item_selected();
|
||||||
void _class_list_item_edited();
|
void _class_list_item_edited();
|
||||||
|
@ -1557,7 +1557,6 @@ EditorFileDialog::EditorFileDialog() {
|
|||||||
show_hidden_files = default_show_hidden_files;
|
show_hidden_files = default_show_hidden_files;
|
||||||
display_mode = default_display_mode;
|
display_mode = default_display_mode;
|
||||||
local_history_pos = 0;
|
local_history_pos = 0;
|
||||||
disable_overwrite_warning = false;
|
|
||||||
VBoxContainer *vbc = memnew(VBoxContainer);
|
VBoxContainer *vbc = memnew(VBoxContainer);
|
||||||
add_child(vbc);
|
add_child(vbc);
|
||||||
|
|
||||||
@ -1814,15 +1813,12 @@ EditorFileDialog::EditorFileDialog() {
|
|||||||
set_hide_on_ok(false);
|
set_hide_on_ok(false);
|
||||||
vbox = vbc;
|
vbox = vbc;
|
||||||
|
|
||||||
invalidated = true;
|
|
||||||
if (register_func) {
|
if (register_func) {
|
||||||
register_func(this);
|
register_func(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
previews_enabled = true;
|
|
||||||
preview_wheel_timeout = 0;
|
preview_wheel_timeout = 0;
|
||||||
preview_wheel_index = 0;
|
preview_wheel_index = 0;
|
||||||
preview_waiting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EditorFileDialog::~EditorFileDialog() {
|
EditorFileDialog::~EditorFileDialog() {
|
||||||
|
@ -135,8 +135,8 @@ private:
|
|||||||
|
|
||||||
Vector<String> filters;
|
Vector<String> filters;
|
||||||
|
|
||||||
bool previews_enabled;
|
bool previews_enabled = true;
|
||||||
bool preview_waiting;
|
bool preview_waiting = false;
|
||||||
int preview_wheel_index;
|
int preview_wheel_index;
|
||||||
float preview_wheel_timeout;
|
float preview_wheel_timeout;
|
||||||
|
|
||||||
@ -145,8 +145,8 @@ private:
|
|||||||
bool show_hidden_files;
|
bool show_hidden_files;
|
||||||
DisplayMode display_mode;
|
DisplayMode display_mode;
|
||||||
|
|
||||||
bool disable_overwrite_warning;
|
bool disable_overwrite_warning = false;
|
||||||
bool invalidated;
|
bool invalidated = true;
|
||||||
|
|
||||||
void update_dir();
|
void update_dir();
|
||||||
void update_file_name();
|
void update_file_name();
|
||||||
|
@ -194,7 +194,6 @@ void EditorFileSystemDirectory::_bind_methods() {
|
|||||||
EditorFileSystemDirectory::EditorFileSystemDirectory() {
|
EditorFileSystemDirectory::EditorFileSystemDirectory() {
|
||||||
modified_time = 0;
|
modified_time = 0;
|
||||||
parent = nullptr;
|
parent = nullptr;
|
||||||
verified = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EditorFileSystemDirectory::~EditorFileSystemDirectory() {
|
EditorFileSystemDirectory::~EditorFileSystemDirectory() {
|
||||||
@ -2383,24 +2382,14 @@ EditorFileSystem::EditorFileSystem() {
|
|||||||
filesystem = memnew(EditorFileSystemDirectory); //like, empty
|
filesystem = memnew(EditorFileSystemDirectory); //like, empty
|
||||||
filesystem->parent = nullptr;
|
filesystem->parent = nullptr;
|
||||||
|
|
||||||
scanning = false;
|
|
||||||
importing = false;
|
|
||||||
use_threads = true;
|
|
||||||
new_filesystem = nullptr;
|
new_filesystem = nullptr;
|
||||||
|
|
||||||
abort_scan = false;
|
|
||||||
scanning_changes = false;
|
|
||||||
scanning_changes_done = false;
|
|
||||||
|
|
||||||
// This should probably also work on Unix and use the string it returns for FAT32 or exFAT
|
// This should probably also work on Unix and use the string it returns for FAT32 or exFAT
|
||||||
DirAccessRef da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
|
DirAccessRef da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
|
||||||
using_fat32_or_exfat = (da->get_filesystem_type() == "FAT32" || da->get_filesystem_type() == "exFAT");
|
using_fat32_or_exfat = (da->get_filesystem_type() == "FAT32" || da->get_filesystem_type() == "exFAT");
|
||||||
|
|
||||||
scan_total = 0;
|
scan_total = 0;
|
||||||
update_script_classes_queued.clear();
|
update_script_classes_queued.clear();
|
||||||
first_scan = true;
|
|
||||||
scan_changes_pending = false;
|
|
||||||
revalidate_import_files = false;
|
|
||||||
import_threads.init();
|
import_threads.init();
|
||||||
ResourceUID::get_singleton()->clear(); //will be updated on scan
|
ResourceUID::get_singleton()->clear(); //will be updated on scan
|
||||||
ResourceSaver::set_get_resource_id_for_path(_resource_saver_get_resource_id_for_path);
|
ResourceSaver::set_get_resource_id_for_path(_resource_saver_get_resource_id_for_path);
|
||||||
|
@ -47,7 +47,7 @@ class EditorFileSystemDirectory : public Object {
|
|||||||
|
|
||||||
String name;
|
String name;
|
||||||
uint64_t modified_time;
|
uint64_t modified_time;
|
||||||
bool verified; //used for checking changes
|
bool verified = false; //used for checking changes
|
||||||
|
|
||||||
EditorFileSystemDirectory *parent;
|
EditorFileSystemDirectory *parent;
|
||||||
Vector<EditorFileSystemDirectory *> subdirs;
|
Vector<EditorFileSystemDirectory *> subdirs;
|
||||||
@ -132,20 +132,20 @@ class EditorFileSystem : public Node {
|
|||||||
EditorFileSystemDirectory::FileInfo *new_file = nullptr;
|
EditorFileSystemDirectory::FileInfo *new_file = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
bool use_threads;
|
bool use_threads = true;
|
||||||
Thread thread;
|
Thread thread;
|
||||||
static void _thread_func(void *_userdata);
|
static void _thread_func(void *_userdata);
|
||||||
|
|
||||||
EditorFileSystemDirectory *new_filesystem;
|
EditorFileSystemDirectory *new_filesystem;
|
||||||
|
|
||||||
bool abort_scan;
|
bool abort_scan = false;
|
||||||
bool scanning;
|
bool scanning = false;
|
||||||
bool importing;
|
bool importing = false;
|
||||||
bool first_scan;
|
bool first_scan = true;
|
||||||
bool scan_changes_pending;
|
bool scan_changes_pending = false;
|
||||||
float scan_total;
|
float scan_total;
|
||||||
String filesystem_settings_version_for_import;
|
String filesystem_settings_version_for_import;
|
||||||
bool revalidate_import_files;
|
bool revalidate_import_files = false;
|
||||||
|
|
||||||
void _scan_filesystem();
|
void _scan_filesystem();
|
||||||
|
|
||||||
@ -197,8 +197,8 @@ class EditorFileSystem : public Node {
|
|||||||
void _scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess *da, const ScanProgress &p_progress);
|
void _scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess *da, const ScanProgress &p_progress);
|
||||||
|
|
||||||
Thread thread_sources;
|
Thread thread_sources;
|
||||||
bool scanning_changes;
|
bool scanning_changes = false;
|
||||||
bool scanning_changes_done;
|
bool scanning_changes_done = false;
|
||||||
|
|
||||||
static void _thread_func_sources(void *_userdata);
|
static void _thread_func_sources(void *_userdata);
|
||||||
|
|
||||||
|
@ -1897,8 +1897,6 @@ EditorHelp::EditorHelp() {
|
|||||||
|
|
||||||
class_desc->set_selection_enabled(true);
|
class_desc->set_selection_enabled(true);
|
||||||
|
|
||||||
scroll_locked = false;
|
|
||||||
select_locked = false;
|
|
||||||
class_desc->hide();
|
class_desc->hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ class EditorHelp : public VBoxContainer {
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
bool select_locked;
|
bool select_locked = false;
|
||||||
|
|
||||||
String prev_search;
|
String prev_search;
|
||||||
|
|
||||||
@ -144,7 +144,7 @@ class EditorHelp : public VBoxContainer {
|
|||||||
void _help_callback(const String &p_topic);
|
void _help_callback(const String &p_topic);
|
||||||
|
|
||||||
void _add_text(const String &p_bbcode);
|
void _add_text(const String &p_bbcode);
|
||||||
bool scroll_locked;
|
bool scroll_locked = false;
|
||||||
|
|
||||||
//void _button_pressed(int p_idx);
|
//void _button_pressed(int p_idx);
|
||||||
void _add_type(const String &p_type, const String &p_enum = String());
|
void _add_type(const String &p_type, const String &p_enum = String());
|
||||||
|
@ -180,8 +180,6 @@ void EditorHelpSearch::popup_dialog(const String &p_term) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditorHelpSearch::EditorHelpSearch() {
|
EditorHelpSearch::EditorHelpSearch() {
|
||||||
old_search = false;
|
|
||||||
|
|
||||||
set_hide_on_ok(false);
|
set_hide_on_ok(false);
|
||||||
|
|
||||||
set_title(TTR("Search Help"));
|
set_title(TTR("Search Help"));
|
||||||
|
@ -60,7 +60,7 @@ class EditorHelpSearch : public ConfirmationDialog {
|
|||||||
Button *hierarchy_button;
|
Button *hierarchy_button;
|
||||||
OptionButton *filter_combo;
|
OptionButton *filter_combo;
|
||||||
Tree *results_tree;
|
Tree *results_tree;
|
||||||
bool old_search;
|
bool old_search = false;
|
||||||
String old_term;
|
String old_term;
|
||||||
|
|
||||||
class Runner;
|
class Runner;
|
||||||
|
@ -948,31 +948,13 @@ void EditorProperty::_bind_methods() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditorProperty::EditorProperty() {
|
EditorProperty::EditorProperty() {
|
||||||
draw_top_bg = true;
|
|
||||||
object = nullptr;
|
object = nullptr;
|
||||||
split_ratio = 0.5;
|
split_ratio = 0.5;
|
||||||
selectable = true;
|
|
||||||
text_size = 0;
|
text_size = 0;
|
||||||
read_only = false;
|
|
||||||
checkable = false;
|
|
||||||
checked = false;
|
|
||||||
draw_warning = false;
|
|
||||||
keying = false;
|
|
||||||
deletable = false;
|
|
||||||
keying_hover = false;
|
|
||||||
revert_hover = false;
|
|
||||||
check_hover = false;
|
|
||||||
can_revert = false;
|
|
||||||
can_pin = false;
|
|
||||||
pin_hidden = false;
|
|
||||||
pinned = false;
|
|
||||||
use_folding = false;
|
|
||||||
property_usage = 0;
|
property_usage = 0;
|
||||||
selected = false;
|
|
||||||
selected_focusable = -1;
|
selected_focusable = -1;
|
||||||
label_reference = nullptr;
|
label_reference = nullptr;
|
||||||
bottom_editor = nullptr;
|
bottom_editor = nullptr;
|
||||||
delete_hover = false;
|
|
||||||
menu = nullptr;
|
menu = nullptr;
|
||||||
set_process_unhandled_key_input(true);
|
set_process_unhandled_key_input(true);
|
||||||
}
|
}
|
||||||
@ -3675,25 +3657,11 @@ EditorInspector::EditorInspector() {
|
|||||||
add_child(main_vbox);
|
add_child(main_vbox);
|
||||||
set_horizontal_scroll_mode(SCROLL_MODE_DISABLED);
|
set_horizontal_scroll_mode(SCROLL_MODE_DISABLED);
|
||||||
|
|
||||||
wide_editors = false;
|
|
||||||
show_categories = false;
|
|
||||||
hide_script = true;
|
|
||||||
use_doc_hints = false;
|
|
||||||
capitalize_paths = true;
|
|
||||||
use_filter = false;
|
|
||||||
autoclear = false;
|
|
||||||
changing = 0;
|
changing = 0;
|
||||||
use_folding = false;
|
|
||||||
update_all_pending = false;
|
|
||||||
update_tree_pending = false;
|
|
||||||
read_only = false;
|
|
||||||
search_box = nullptr;
|
search_box = nullptr;
|
||||||
keying = false;
|
|
||||||
_prop_edited = "property_edited";
|
_prop_edited = "property_edited";
|
||||||
set_process(false);
|
set_process(false);
|
||||||
property_focusable = -1;
|
property_focusable = -1;
|
||||||
sub_inspector = false;
|
|
||||||
deletable_properties = false;
|
|
||||||
property_clipboard = Variant();
|
property_clipboard = Variant();
|
||||||
|
|
||||||
get_v_scroll_bar()->connect("value_changed", callable_mp(this, &EditorInspector::_vscroll_changed));
|
get_v_scroll_bar()->connect("value_changed", callable_mp(this, &EditorInspector::_vscroll_changed));
|
||||||
|
@ -71,12 +71,12 @@ private:
|
|||||||
|
|
||||||
int property_usage;
|
int property_usage;
|
||||||
|
|
||||||
bool read_only;
|
bool read_only = false;
|
||||||
bool checkable;
|
bool checkable = false;
|
||||||
bool checked;
|
bool checked = false;
|
||||||
bool draw_warning;
|
bool draw_warning = false;
|
||||||
bool keying;
|
bool keying = false;
|
||||||
bool deletable;
|
bool deletable = false;
|
||||||
|
|
||||||
Rect2 right_child_rect;
|
Rect2 right_child_rect;
|
||||||
Rect2 bottom_child_rect;
|
Rect2 bottom_child_rect;
|
||||||
@ -90,19 +90,19 @@ private:
|
|||||||
Rect2 delete_rect;
|
Rect2 delete_rect;
|
||||||
bool delete_hover = false;
|
bool delete_hover = false;
|
||||||
|
|
||||||
bool can_revert;
|
bool can_revert = false;
|
||||||
bool can_pin;
|
bool can_pin = false;
|
||||||
bool pin_hidden;
|
bool pin_hidden = false;
|
||||||
bool pinned;
|
bool pinned = false;
|
||||||
|
|
||||||
bool use_folding;
|
bool use_folding = false;
|
||||||
bool draw_top_bg;
|
bool draw_top_bg = true;
|
||||||
|
|
||||||
void _update_popup();
|
void _update_popup();
|
||||||
void _focusable_focused(int p_index);
|
void _focusable_focused(int p_index);
|
||||||
|
|
||||||
bool selectable;
|
bool selectable = true;
|
||||||
bool selected;
|
bool selected = false;
|
||||||
int selected_focusable;
|
int selected_focusable;
|
||||||
|
|
||||||
float split_ratio;
|
float split_ratio;
|
||||||
@ -442,23 +442,23 @@ class EditorInspector : public ScrollContainer {
|
|||||||
//
|
//
|
||||||
|
|
||||||
LineEdit *search_box;
|
LineEdit *search_box;
|
||||||
bool show_categories;
|
bool show_categories = false;
|
||||||
bool hide_script;
|
bool hide_script = true;
|
||||||
bool use_doc_hints;
|
bool use_doc_hints = false;
|
||||||
bool capitalize_paths;
|
bool capitalize_paths = true;
|
||||||
bool use_filter;
|
bool use_filter = false;
|
||||||
bool autoclear;
|
bool autoclear = false;
|
||||||
bool use_folding;
|
bool use_folding = false;
|
||||||
int changing;
|
int changing;
|
||||||
bool update_all_pending;
|
bool update_all_pending = false;
|
||||||
bool read_only;
|
bool read_only = false;
|
||||||
bool keying;
|
bool keying = false;
|
||||||
bool sub_inspector;
|
bool sub_inspector = false;
|
||||||
bool wide_editors;
|
bool wide_editors = false;
|
||||||
bool deletable_properties;
|
bool deletable_properties = false;
|
||||||
|
|
||||||
float refresh_countdown;
|
float refresh_countdown;
|
||||||
bool update_tree_pending;
|
bool update_tree_pending = false;
|
||||||
StringName _prop_edited;
|
StringName _prop_edited;
|
||||||
StringName property_selected;
|
StringName property_selected;
|
||||||
int property_focusable;
|
int property_focusable;
|
||||||
|
@ -5841,16 +5841,7 @@ EditorNode::EditorNode() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
singleton = this;
|
singleton = this;
|
||||||
exiting = false;
|
|
||||||
dimmed = false;
|
|
||||||
last_checked_version = 0;
|
last_checked_version = 0;
|
||||||
changing_scene = false;
|
|
||||||
_initializing_addons = false;
|
|
||||||
docks_visible = true;
|
|
||||||
restoring_scenes = false;
|
|
||||||
cmdline_export_mode = false;
|
|
||||||
scene_distraction = false;
|
|
||||||
script_distraction = false;
|
|
||||||
|
|
||||||
TranslationServer::get_singleton()->set_enabled(false);
|
TranslationServer::get_singleton()->set_enabled(false);
|
||||||
// load settings
|
// load settings
|
||||||
@ -7112,9 +7103,6 @@ EditorNode::EditorNode() {
|
|||||||
current = nullptr;
|
current = nullptr;
|
||||||
saving_resource = Ref<Resource>();
|
saving_resource = Ref<Resource>();
|
||||||
|
|
||||||
reference_resource_mem = true;
|
|
||||||
save_external_resources_mem = true;
|
|
||||||
|
|
||||||
set_process(true);
|
set_process(true);
|
||||||
|
|
||||||
open_imported = memnew(ConfirmationDialog);
|
open_imported = memnew(ConfirmationDialog);
|
||||||
@ -7125,7 +7113,6 @@ EditorNode::EditorNode() {
|
|||||||
gui_base->add_child(open_imported);
|
gui_base->add_child(open_imported);
|
||||||
|
|
||||||
saved_version = 1;
|
saved_version = 1;
|
||||||
unsaved_cache = true;
|
|
||||||
_last_instantiated_scene = nullptr;
|
_last_instantiated_scene = nullptr;
|
||||||
|
|
||||||
quick_open = memnew(EditorQuickOpen);
|
quick_open = memnew(EditorQuickOpen);
|
||||||
@ -7139,10 +7126,7 @@ EditorNode::EditorNode() {
|
|||||||
_update_recent_scenes();
|
_update_recent_scenes();
|
||||||
|
|
||||||
editor_data.restore_editor_global_states();
|
editor_data.restore_editor_global_states();
|
||||||
convert_old = false;
|
|
||||||
opening_prev = false;
|
|
||||||
set_process_unhandled_input(true);
|
set_process_unhandled_input(true);
|
||||||
_playing_edited = false;
|
|
||||||
|
|
||||||
load_errors = memnew(RichTextLabel);
|
load_errors = memnew(RichTextLabel);
|
||||||
load_error_dialog = memnew(AcceptDialog);
|
load_error_dialog = memnew(AcceptDialog);
|
||||||
@ -7183,8 +7167,6 @@ EditorNode::EditorNode() {
|
|||||||
|
|
||||||
FileAccess::set_file_close_fail_notify_callback(_file_access_close_error_notify);
|
FileAccess::set_file_close_fail_notify_callback(_file_access_close_error_notify);
|
||||||
|
|
||||||
waiting_for_first_scan = true;
|
|
||||||
|
|
||||||
print_handler.printfunc = _print_handler;
|
print_handler.printfunc = _print_handler;
|
||||||
print_handler.userdata = this;
|
print_handler.userdata = this;
|
||||||
add_print_handler(&print_handler);
|
add_print_handler(&print_handler);
|
||||||
|
@ -263,8 +263,8 @@ private:
|
|||||||
TextureRect *tab_preview;
|
TextureRect *tab_preview;
|
||||||
int tab_closing;
|
int tab_closing;
|
||||||
|
|
||||||
bool exiting;
|
bool exiting = false;
|
||||||
bool dimmed;
|
bool dimmed = false;
|
||||||
|
|
||||||
int old_split_ofs;
|
int old_split_ofs;
|
||||||
VSplitContainer *top_split;
|
VSplitContainer *top_split;
|
||||||
@ -380,15 +380,15 @@ private:
|
|||||||
Button *dock_tab_move_right;
|
Button *dock_tab_move_right;
|
||||||
int dock_popup_selected;
|
int dock_popup_selected;
|
||||||
Timer *dock_drag_timer;
|
Timer *dock_drag_timer;
|
||||||
bool docks_visible;
|
bool docks_visible = true;
|
||||||
|
|
||||||
HBoxContainer *tabbar_container;
|
HBoxContainer *tabbar_container;
|
||||||
Button *distraction_free;
|
Button *distraction_free;
|
||||||
Button *scene_tab_add;
|
Button *scene_tab_add;
|
||||||
Control *scene_tab_add_ph;
|
Control *scene_tab_add_ph;
|
||||||
|
|
||||||
bool scene_distraction;
|
bool scene_distraction = false;
|
||||||
bool script_distraction;
|
bool script_distraction = false;
|
||||||
|
|
||||||
String _tmp_import_path;
|
String _tmp_import_path;
|
||||||
|
|
||||||
@ -397,18 +397,15 @@ private:
|
|||||||
Object *current;
|
Object *current;
|
||||||
Ref<Resource> saving_resource;
|
Ref<Resource> saving_resource;
|
||||||
|
|
||||||
bool _playing_edited;
|
bool _playing_edited = false;
|
||||||
String run_custom_filename;
|
String run_custom_filename;
|
||||||
bool reference_resource_mem;
|
bool reference_resource_mem = true;
|
||||||
bool save_external_resources_mem;
|
|
||||||
uint64_t saved_version;
|
uint64_t saved_version;
|
||||||
uint64_t last_checked_version;
|
uint64_t last_checked_version;
|
||||||
bool unsaved_cache;
|
bool unsaved_cache = true;
|
||||||
String open_navigate;
|
String open_navigate;
|
||||||
bool changing_scene;
|
bool changing_scene = false;
|
||||||
bool waiting_for_first_scan;
|
bool waiting_for_first_scan = true;
|
||||||
|
|
||||||
bool waiting_for_sources_changed;
|
|
||||||
|
|
||||||
uint64_t update_spinner_step_msec;
|
uint64_t update_spinner_step_msec;
|
||||||
uint64_t update_spinner_step_frame;
|
uint64_t update_spinner_step_frame;
|
||||||
@ -457,7 +454,7 @@ private:
|
|||||||
|
|
||||||
String external_file;
|
String external_file;
|
||||||
List<String> previous_scenes;
|
List<String> previous_scenes;
|
||||||
bool opening_prev;
|
bool opening_prev = false;
|
||||||
|
|
||||||
void _dialog_action(String p_file);
|
void _dialog_action(String p_file);
|
||||||
|
|
||||||
@ -534,7 +531,7 @@ private:
|
|||||||
|
|
||||||
void _exit_editor(int p_exit_code);
|
void _exit_editor(int p_exit_code);
|
||||||
|
|
||||||
bool convert_old;
|
bool convert_old = false;
|
||||||
|
|
||||||
virtual void unhandled_input(const Ref<InputEvent> &p_event) override;
|
virtual void unhandled_input(const Ref<InputEvent> &p_event) override;
|
||||||
|
|
||||||
@ -551,7 +548,7 @@ private:
|
|||||||
Map<String, Ref<Texture2D>> icon_type_cache;
|
Map<String, Ref<Texture2D>> icon_type_cache;
|
||||||
void _build_icon_type_cache();
|
void _build_icon_type_cache();
|
||||||
|
|
||||||
bool _initializing_addons;
|
bool _initializing_addons = false;
|
||||||
Map<String, EditorPlugin *> plugin_addons;
|
Map<String, EditorPlugin *> plugin_addons;
|
||||||
|
|
||||||
static Ref<Texture2D> _file_dialog_get_icon(const String &p_path);
|
static Ref<Texture2D> _file_dialog_get_icon(const String &p_path);
|
||||||
@ -587,7 +584,7 @@ private:
|
|||||||
bool pack_only = false;
|
bool pack_only = false;
|
||||||
} export_defer;
|
} export_defer;
|
||||||
|
|
||||||
bool cmdline_export_mode;
|
bool cmdline_export_mode = false;
|
||||||
|
|
||||||
static EditorNode *singleton;
|
static EditorNode *singleton;
|
||||||
|
|
||||||
@ -627,7 +624,7 @@ private:
|
|||||||
void _update_dock_slots_visibility();
|
void _update_dock_slots_visibility();
|
||||||
void _dock_tab_changed(int p_tab);
|
void _dock_tab_changed(int p_tab);
|
||||||
|
|
||||||
bool restoring_scenes;
|
bool restoring_scenes = false;
|
||||||
void _save_open_scenes_to_config(Ref<ConfigFile> p_layout, const String &p_section);
|
void _save_open_scenes_to_config(Ref<ConfigFile> p_layout, const String &p_section);
|
||||||
void _load_open_scenes_from_config(Ref<ConfigFile> p_layout, const String &p_section);
|
void _load_open_scenes_from_config(Ref<ConfigFile> p_layout, const String &p_section);
|
||||||
|
|
||||||
|
@ -240,6 +240,4 @@ EditorPluginSettings::EditorPluginSettings() {
|
|||||||
mc->set_h_size_flags(SIZE_EXPAND_FILL);
|
mc->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||||
|
|
||||||
add_child(mc);
|
add_child(mc);
|
||||||
|
|
||||||
updating = false;
|
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ class EditorPluginSettings : public VBoxContainer {
|
|||||||
Button *create_plugin;
|
Button *create_plugin;
|
||||||
Button *update_list;
|
Button *update_list;
|
||||||
Tree *plugin_list;
|
Tree *plugin_list;
|
||||||
bool updating;
|
bool updating = false;
|
||||||
|
|
||||||
void _plugin_activity_changed();
|
void _plugin_activity_changed();
|
||||||
void _create_clicked();
|
void _create_clicked();
|
||||||
|
@ -110,9 +110,6 @@ EditorPropertyText::EditorPropertyText() {
|
|||||||
add_focusable(text);
|
add_focusable(text);
|
||||||
text->connect("text_changed", callable_mp(this, &EditorPropertyText::_text_changed));
|
text->connect("text_changed", callable_mp(this, &EditorPropertyText::_text_changed));
|
||||||
text->connect("text_submitted", callable_mp(this, &EditorPropertyText::_text_submitted));
|
text->connect("text_submitted", callable_mp(this, &EditorPropertyText::_text_submitted));
|
||||||
|
|
||||||
string_name = false;
|
|
||||||
updating = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// MULTILINE TEXT /////////////////////////
|
///////////////////// MULTILINE TEXT /////////////////////////
|
||||||
@ -500,9 +497,6 @@ EditorPropertyPath::EditorPropertyPath() {
|
|||||||
add_focusable(path);
|
add_focusable(path);
|
||||||
dialog = nullptr;
|
dialog = nullptr;
|
||||||
path_edit->connect("pressed", callable_mp(this, &EditorPropertyPath::_path_pressed));
|
path_edit->connect("pressed", callable_mp(this, &EditorPropertyPath::_path_pressed));
|
||||||
folder = false;
|
|
||||||
global = false;
|
|
||||||
save_mode = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// CLASS NAME /////////////////////////
|
///////////////////// CLASS NAME /////////////////////////
|
||||||
@ -1278,7 +1272,6 @@ EditorPropertyInteger::EditorPropertyInteger() {
|
|||||||
add_child(spin);
|
add_child(spin);
|
||||||
add_focusable(spin);
|
add_focusable(spin);
|
||||||
spin->connect("value_changed", callable_mp(this, &EditorPropertyInteger::_value_changed));
|
spin->connect("value_changed", callable_mp(this, &EditorPropertyInteger::_value_changed));
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// OBJECT ID /////////////////////////
|
///////////////////// OBJECT ID /////////////////////////
|
||||||
@ -1587,10 +1580,6 @@ EditorPropertyEasing::EditorPropertyEasing() {
|
|||||||
spin->get_line_edit()->connect("focus_exited", callable_mp(this, &EditorPropertyEasing::_spin_focus_exited));
|
spin->get_line_edit()->connect("focus_exited", callable_mp(this, &EditorPropertyEasing::_spin_focus_exited));
|
||||||
spin->hide();
|
spin->hide();
|
||||||
add_child(spin);
|
add_child(spin);
|
||||||
|
|
||||||
dragging = false;
|
|
||||||
flip = false;
|
|
||||||
full = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// VECTOR2 /////////////////////////
|
///////////////////// VECTOR2 /////////////////////////
|
||||||
@ -1680,7 +1669,6 @@ EditorPropertyVector2::EditorPropertyVector2(bool p_force_wide) {
|
|||||||
if (!horizontal) {
|
if (!horizontal) {
|
||||||
set_label_reference(spin[0]); //show text and buttons around this
|
set_label_reference(spin[0]); //show text and buttons around this
|
||||||
}
|
}
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// RECT2 /////////////////////////
|
///////////////////// RECT2 /////////////////////////
|
||||||
@ -1784,7 +1772,6 @@ EditorPropertyRect2::EditorPropertyRect2(bool p_force_wide) {
|
|||||||
if (!horizontal) {
|
if (!horizontal) {
|
||||||
set_label_reference(spin[0]); //show text and buttons around this
|
set_label_reference(spin[0]); //show text and buttons around this
|
||||||
}
|
}
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// VECTOR3 /////////////////////////
|
///////////////////// VECTOR3 /////////////////////////
|
||||||
@ -1993,7 +1980,6 @@ EditorPropertyVector2i::EditorPropertyVector2i(bool p_force_wide) {
|
|||||||
if (!horizontal) {
|
if (!horizontal) {
|
||||||
set_label_reference(spin[0]); //show text and buttons around this
|
set_label_reference(spin[0]); //show text and buttons around this
|
||||||
}
|
}
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// RECT2i /////////////////////////
|
///////////////////// RECT2i /////////////////////////
|
||||||
@ -2097,7 +2083,6 @@ EditorPropertyRect2i::EditorPropertyRect2i(bool p_force_wide) {
|
|||||||
if (!horizontal) {
|
if (!horizontal) {
|
||||||
set_label_reference(spin[0]); //show text and buttons around this
|
set_label_reference(spin[0]); //show text and buttons around this
|
||||||
}
|
}
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// VECTOR3i /////////////////////////
|
///////////////////// VECTOR3i /////////////////////////
|
||||||
@ -2188,7 +2173,6 @@ EditorPropertyVector3i::EditorPropertyVector3i(bool p_force_wide) {
|
|||||||
if (!horizontal) {
|
if (!horizontal) {
|
||||||
set_label_reference(spin[0]); //show text and buttons around this
|
set_label_reference(spin[0]); //show text and buttons around this
|
||||||
}
|
}
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// PLANE /////////////////////////
|
///////////////////// PLANE /////////////////////////
|
||||||
@ -2282,7 +2266,6 @@ EditorPropertyPlane::EditorPropertyPlane(bool p_force_wide) {
|
|||||||
if (!horizontal) {
|
if (!horizontal) {
|
||||||
set_label_reference(spin[0]); //show text and buttons around this
|
set_label_reference(spin[0]); //show text and buttons around this
|
||||||
}
|
}
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// QUATERNION /////////////////////////
|
///////////////////// QUATERNION /////////////////////////
|
||||||
@ -2373,7 +2356,6 @@ EditorPropertyQuaternion::EditorPropertyQuaternion() {
|
|||||||
if (!horizontal) {
|
if (!horizontal) {
|
||||||
set_label_reference(spin[0]); //show text and buttons around this
|
set_label_reference(spin[0]); //show text and buttons around this
|
||||||
}
|
}
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// AABB /////////////////////////
|
///////////////////// AABB /////////////////////////
|
||||||
@ -2457,7 +2439,6 @@ EditorPropertyAABB::EditorPropertyAABB() {
|
|||||||
spin[i]->connect("value_changed", callable_mp(this, &EditorPropertyAABB::_value_changed), varray(desc[i]));
|
spin[i]->connect("value_changed", callable_mp(this, &EditorPropertyAABB::_value_changed), varray(desc[i]));
|
||||||
}
|
}
|
||||||
set_bottom_editor(g);
|
set_bottom_editor(g);
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// TRANSFORM2D /////////////////////////
|
///////////////////// TRANSFORM2D /////////////////////////
|
||||||
@ -2547,7 +2528,6 @@ EditorPropertyTransform2D::EditorPropertyTransform2D(bool p_include_origin) {
|
|||||||
spin[i]->connect("value_changed", callable_mp(this, &EditorPropertyTransform2D::_value_changed), varray(desc[i]));
|
spin[i]->connect("value_changed", callable_mp(this, &EditorPropertyTransform2D::_value_changed), varray(desc[i]));
|
||||||
}
|
}
|
||||||
set_bottom_editor(g);
|
set_bottom_editor(g);
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// BASIS /////////////////////////
|
///////////////////// BASIS /////////////////////////
|
||||||
@ -2636,7 +2616,6 @@ EditorPropertyBasis::EditorPropertyBasis() {
|
|||||||
spin[i]->connect("value_changed", callable_mp(this, &EditorPropertyBasis::_value_changed), varray(desc[i]));
|
spin[i]->connect("value_changed", callable_mp(this, &EditorPropertyBasis::_value_changed), varray(desc[i]));
|
||||||
}
|
}
|
||||||
set_bottom_editor(g);
|
set_bottom_editor(g);
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// TRANSFORM /////////////////////////
|
///////////////////// TRANSFORM /////////////////////////
|
||||||
@ -2733,7 +2712,6 @@ EditorPropertyTransform3D::EditorPropertyTransform3D() {
|
|||||||
spin[i]->connect("value_changed", callable_mp(this, &EditorPropertyTransform3D::_value_changed), varray(desc[i]));
|
spin[i]->connect("value_changed", callable_mp(this, &EditorPropertyTransform3D::_value_changed), varray(desc[i]));
|
||||||
}
|
}
|
||||||
set_bottom_editor(g);
|
set_bottom_editor(g);
|
||||||
setting = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////// COLOR PICKER //////////////////////
|
////////////// COLOR PICKER //////////////////////
|
||||||
@ -2969,7 +2947,6 @@ EditorPropertyNodePath::EditorPropertyNodePath() {
|
|||||||
clear->set_flat(true);
|
clear->set_flat(true);
|
||||||
clear->connect("pressed", callable_mp(this, &EditorPropertyNodePath::_node_clear));
|
clear->connect("pressed", callable_mp(this, &EditorPropertyNodePath::_node_clear));
|
||||||
hbc->add_child(clear);
|
hbc->add_child(clear);
|
||||||
use_path_from_scene_root = false;
|
|
||||||
|
|
||||||
scene_tree = nullptr; //do not allocate unnecessarily
|
scene_tree = nullptr; //do not allocate unnecessarily
|
||||||
}
|
}
|
||||||
|
@ -54,8 +54,8 @@ class EditorPropertyText : public EditorProperty {
|
|||||||
GDCLASS(EditorPropertyText, EditorProperty);
|
GDCLASS(EditorPropertyText, EditorProperty);
|
||||||
LineEdit *text;
|
LineEdit *text;
|
||||||
|
|
||||||
bool updating;
|
bool updating = false;
|
||||||
bool string_name;
|
bool string_name = false;
|
||||||
void _text_changed(const String &p_string);
|
void _text_changed(const String &p_string);
|
||||||
void _text_submitted(const String &p_string);
|
void _text_submitted(const String &p_string);
|
||||||
|
|
||||||
@ -131,9 +131,9 @@ public:
|
|||||||
class EditorPropertyPath : public EditorProperty {
|
class EditorPropertyPath : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyPath, EditorProperty);
|
GDCLASS(EditorPropertyPath, EditorProperty);
|
||||||
Vector<String> extensions;
|
Vector<String> extensions;
|
||||||
bool folder;
|
bool folder = false;
|
||||||
bool global;
|
bool global = false;
|
||||||
bool save_mode;
|
bool save_mode = false;
|
||||||
EditorFileDialog *dialog;
|
EditorFileDialog *dialog;
|
||||||
LineEdit *path;
|
LineEdit *path;
|
||||||
Button *path_edit;
|
Button *path_edit;
|
||||||
@ -359,7 +359,7 @@ public:
|
|||||||
class EditorPropertyInteger : public EditorProperty {
|
class EditorPropertyInteger : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyInteger, EditorProperty);
|
GDCLASS(EditorPropertyInteger, EditorProperty);
|
||||||
EditorSpinSlider *spin;
|
EditorSpinSlider *spin;
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(int64_t p_val);
|
void _value_changed(int64_t p_val);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -410,11 +410,11 @@ class EditorPropertyEasing : public EditorProperty {
|
|||||||
Control *easing_draw;
|
Control *easing_draw;
|
||||||
PopupMenu *preset;
|
PopupMenu *preset;
|
||||||
EditorSpinSlider *spin;
|
EditorSpinSlider *spin;
|
||||||
bool setting;
|
bool setting = false;
|
||||||
|
|
||||||
bool dragging;
|
bool dragging = false;
|
||||||
bool full;
|
bool full = false;
|
||||||
bool flip;
|
bool flip = false;
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
EASING_ZERO,
|
EASING_ZERO,
|
||||||
@ -450,7 +450,7 @@ public:
|
|||||||
class EditorPropertyVector2 : public EditorProperty {
|
class EditorPropertyVector2 : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyVector2, EditorProperty);
|
GDCLASS(EditorPropertyVector2, EditorProperty);
|
||||||
EditorSpinSlider *spin[2];
|
EditorSpinSlider *spin[2];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -467,7 +467,7 @@ public:
|
|||||||
class EditorPropertyRect2 : public EditorProperty {
|
class EditorPropertyRect2 : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyRect2, EditorProperty);
|
GDCLASS(EditorPropertyRect2, EditorProperty);
|
||||||
EditorSpinSlider *spin[4];
|
EditorSpinSlider *spin[4];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -504,7 +504,7 @@ public:
|
|||||||
class EditorPropertyVector2i : public EditorProperty {
|
class EditorPropertyVector2i : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyVector2i, EditorProperty);
|
GDCLASS(EditorPropertyVector2i, EditorProperty);
|
||||||
EditorSpinSlider *spin[2];
|
EditorSpinSlider *spin[2];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -521,7 +521,7 @@ public:
|
|||||||
class EditorPropertyRect2i : public EditorProperty {
|
class EditorPropertyRect2i : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyRect2i, EditorProperty);
|
GDCLASS(EditorPropertyRect2i, EditorProperty);
|
||||||
EditorSpinSlider *spin[4];
|
EditorSpinSlider *spin[4];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -538,7 +538,7 @@ public:
|
|||||||
class EditorPropertyVector3i : public EditorProperty {
|
class EditorPropertyVector3i : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyVector3i, EditorProperty);
|
GDCLASS(EditorPropertyVector3i, EditorProperty);
|
||||||
EditorSpinSlider *spin[3];
|
EditorSpinSlider *spin[3];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -555,7 +555,7 @@ public:
|
|||||||
class EditorPropertyPlane : public EditorProperty {
|
class EditorPropertyPlane : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyPlane, EditorProperty);
|
GDCLASS(EditorPropertyPlane, EditorProperty);
|
||||||
EditorSpinSlider *spin[4];
|
EditorSpinSlider *spin[4];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -572,7 +572,7 @@ public:
|
|||||||
class EditorPropertyQuaternion : public EditorProperty {
|
class EditorPropertyQuaternion : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyQuaternion, EditorProperty);
|
GDCLASS(EditorPropertyQuaternion, EditorProperty);
|
||||||
EditorSpinSlider *spin[4];
|
EditorSpinSlider *spin[4];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -589,7 +589,7 @@ public:
|
|||||||
class EditorPropertyAABB : public EditorProperty {
|
class EditorPropertyAABB : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyAABB, EditorProperty);
|
GDCLASS(EditorPropertyAABB, EditorProperty);
|
||||||
EditorSpinSlider *spin[6];
|
EditorSpinSlider *spin[6];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -606,7 +606,7 @@ public:
|
|||||||
class EditorPropertyTransform2D : public EditorProperty {
|
class EditorPropertyTransform2D : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyTransform2D, EditorProperty);
|
GDCLASS(EditorPropertyTransform2D, EditorProperty);
|
||||||
EditorSpinSlider *spin[6];
|
EditorSpinSlider *spin[6];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -623,7 +623,7 @@ public:
|
|||||||
class EditorPropertyBasis : public EditorProperty {
|
class EditorPropertyBasis : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyBasis, EditorProperty);
|
GDCLASS(EditorPropertyBasis, EditorProperty);
|
||||||
EditorSpinSlider *spin[9];
|
EditorSpinSlider *spin[9];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -640,7 +640,7 @@ public:
|
|||||||
class EditorPropertyTransform3D : public EditorProperty {
|
class EditorPropertyTransform3D : public EditorProperty {
|
||||||
GDCLASS(EditorPropertyTransform3D, EditorProperty);
|
GDCLASS(EditorPropertyTransform3D, EditorProperty);
|
||||||
EditorSpinSlider *spin[12];
|
EditorSpinSlider *spin[12];
|
||||||
bool setting;
|
bool setting = false;
|
||||||
void _value_changed(double p_val, const String &p_name);
|
void _value_changed(double p_val, const String &p_name);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -681,7 +681,7 @@ class EditorPropertyNodePath : public EditorProperty {
|
|||||||
Button *clear;
|
Button *clear;
|
||||||
SceneTreeDialog *scene_tree;
|
SceneTreeDialog *scene_tree;
|
||||||
NodePath base_hint;
|
NodePath base_hint;
|
||||||
bool use_path_from_scene_root;
|
bool use_path_from_scene_root = false;
|
||||||
|
|
||||||
Vector<StringName> valid_types;
|
Vector<StringName> valid_types;
|
||||||
void _node_selected(const NodePath &p_path);
|
void _node_selected(const NodePath &p_path);
|
||||||
|
@ -714,7 +714,6 @@ EditorPropertyArray::EditorPropertyArray() {
|
|||||||
size_slider = nullptr;
|
size_slider = nullptr;
|
||||||
button_add_item = nullptr;
|
button_add_item = nullptr;
|
||||||
paginator = nullptr;
|
paginator = nullptr;
|
||||||
updating = false;
|
|
||||||
change_type = memnew(PopupMenu);
|
change_type = memnew(PopupMenu);
|
||||||
add_child(change_type);
|
add_child(change_type);
|
||||||
change_type->connect("id_pressed", callable_mp(this, &EditorPropertyArray::_change_type_menu));
|
change_type->connect("id_pressed", callable_mp(this, &EditorPropertyArray::_change_type_menu));
|
||||||
@ -723,8 +722,6 @@ EditorPropertyArray::EditorPropertyArray() {
|
|||||||
subtype = Variant::NIL;
|
subtype = Variant::NIL;
|
||||||
subtype_hint = PROPERTY_HINT_NONE;
|
subtype_hint = PROPERTY_HINT_NONE;
|
||||||
subtype_hint_string = "";
|
subtype_hint_string = "";
|
||||||
|
|
||||||
dropping = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////// DICTIONARY ///////////////////////////
|
///////////////////// DICTIONARY ///////////////////////////
|
||||||
@ -1211,7 +1208,6 @@ EditorPropertyDictionary::EditorPropertyDictionary() {
|
|||||||
vbox = nullptr;
|
vbox = nullptr;
|
||||||
button_add_item = nullptr;
|
button_add_item = nullptr;
|
||||||
paginator = nullptr;
|
paginator = nullptr;
|
||||||
updating = false;
|
|
||||||
change_type = memnew(PopupMenu);
|
change_type = memnew(PopupMenu);
|
||||||
add_child(change_type);
|
add_child(change_type);
|
||||||
change_type->connect("id_pressed", callable_mp(this, &EditorPropertyDictionary::_change_type_menu));
|
change_type->connect("id_pressed", callable_mp(this, &EditorPropertyDictionary::_change_type_menu));
|
||||||
|
@ -81,8 +81,8 @@ class EditorPropertyArray : public EditorProperty {
|
|||||||
GDCLASS(EditorPropertyArray, EditorProperty);
|
GDCLASS(EditorPropertyArray, EditorProperty);
|
||||||
|
|
||||||
PopupMenu *change_type;
|
PopupMenu *change_type;
|
||||||
bool updating;
|
bool updating = false;
|
||||||
bool dropping;
|
bool dropping = false;
|
||||||
|
|
||||||
Ref<EditorPropertyArrayObject> object;
|
Ref<EditorPropertyArrayObject> object;
|
||||||
int page_length = 20;
|
int page_length = 20;
|
||||||
@ -139,7 +139,7 @@ class EditorPropertyDictionary : public EditorProperty {
|
|||||||
GDCLASS(EditorPropertyDictionary, EditorProperty);
|
GDCLASS(EditorPropertyDictionary, EditorProperty);
|
||||||
|
|
||||||
PopupMenu *change_type;
|
PopupMenu *change_type;
|
||||||
bool updating;
|
bool updating = false;
|
||||||
|
|
||||||
Ref<EditorPropertyDictionaryObject> object;
|
Ref<EditorPropertyDictionaryObject> object;
|
||||||
int page_length = 20;
|
int page_length = 20;
|
||||||
|
@ -168,7 +168,6 @@ bool EditorRunNative::is_deploy_debug_remote_enabled() const {
|
|||||||
|
|
||||||
EditorRunNative::EditorRunNative() {
|
EditorRunNative::EditorRunNative() {
|
||||||
set_process(true);
|
set_process(true);
|
||||||
first = true;
|
|
||||||
resume_idx = 0;
|
resume_idx = 0;
|
||||||
resume_platform = 0;
|
resume_platform = 0;
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ class EditorRunNative : public HBoxContainer {
|
|||||||
GDCLASS(EditorRunNative, HBoxContainer);
|
GDCLASS(EditorRunNative, HBoxContainer);
|
||||||
|
|
||||||
Map<int, MenuButton *> menus;
|
Map<int, MenuButton *> menus;
|
||||||
bool first;
|
bool first = true;
|
||||||
|
|
||||||
int resume_idx;
|
int resume_idx;
|
||||||
int resume_platform;
|
int resume_platform;
|
||||||
|
@ -1660,8 +1660,6 @@ void EditorSettings::_bind_methods() {
|
|||||||
|
|
||||||
EditorSettings::EditorSettings() {
|
EditorSettings::EditorSettings() {
|
||||||
last_order = 0;
|
last_order = 0;
|
||||||
optimize_save = true;
|
|
||||||
save_changed_setting = true;
|
|
||||||
|
|
||||||
_load_defaults();
|
_load_defaults();
|
||||||
}
|
}
|
||||||
|
@ -92,8 +92,8 @@ private:
|
|||||||
Vector<String> favorites;
|
Vector<String> favorites;
|
||||||
Vector<String> recent_dirs;
|
Vector<String> recent_dirs;
|
||||||
|
|
||||||
bool save_changed_setting;
|
bool save_changed_setting = true;
|
||||||
bool optimize_save; //do not save stuff that came from config but was not set from engine
|
bool optimize_save = true; //do not save stuff that came from config but was not set from engine
|
||||||
|
|
||||||
bool _set(const StringName &p_name, const Variant &p_value);
|
bool _set(const StringName &p_name, const Variant &p_value);
|
||||||
bool _set_only(const StringName &p_name, const Variant &p_value);
|
bool _set_only(const StringName &p_name, const Variant &p_value);
|
||||||
|
@ -764,8 +764,6 @@ EditorSettingsDialog::EditorSettingsDialog() {
|
|||||||
add_child(timer);
|
add_child(timer);
|
||||||
EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &EditorSettingsDialog::_settings_changed));
|
EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &EditorSettingsDialog::_settings_changed));
|
||||||
get_ok_button()->set_text(TTR("Close"));
|
get_ok_button()->set_text(TTR("Close"));
|
||||||
|
|
||||||
updating = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EditorSettingsDialog::~EditorSettingsDialog() {
|
EditorSettingsDialog::~EditorSettingsDialog() {
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
class EditorSettingsDialog : public AcceptDialog {
|
class EditorSettingsDialog : public AcceptDialog {
|
||||||
GDCLASS(EditorSettingsDialog, AcceptDialog);
|
GDCLASS(EditorSettingsDialog, AcceptDialog);
|
||||||
|
|
||||||
bool updating;
|
bool updating = false;
|
||||||
|
|
||||||
TabContainer *tabs;
|
TabContainer *tabs;
|
||||||
Control *tab_general;
|
Control *tab_general;
|
||||||
|
@ -655,14 +655,10 @@ void EditorSpinSlider::_ensure_input_popup() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditorSpinSlider::EditorSpinSlider() {
|
EditorSpinSlider::EditorSpinSlider() {
|
||||||
flat = false;
|
|
||||||
grabbing_spinner_attempt = false;
|
|
||||||
grabbing_spinner = false;
|
|
||||||
grabbing_spinner_dist_cache = 0;
|
grabbing_spinner_dist_cache = 0;
|
||||||
pre_grab_value = 0;
|
pre_grab_value = 0;
|
||||||
set_focus_mode(FOCUS_ALL);
|
set_focus_mode(FOCUS_ALL);
|
||||||
updown_offset = -1;
|
updown_offset = -1;
|
||||||
hover_updown = false;
|
|
||||||
grabber = memnew(TextureRect);
|
grabber = memnew(TextureRect);
|
||||||
add_child(grabber);
|
add_child(grabber);
|
||||||
grabber->hide();
|
grabber->hide();
|
||||||
@ -671,12 +667,5 @@ EditorSpinSlider::EditorSpinSlider() {
|
|||||||
grabber->connect("mouse_entered", callable_mp(this, &EditorSpinSlider::_grabber_mouse_entered));
|
grabber->connect("mouse_entered", callable_mp(this, &EditorSpinSlider::_grabber_mouse_entered));
|
||||||
grabber->connect("mouse_exited", callable_mp(this, &EditorSpinSlider::_grabber_mouse_exited));
|
grabber->connect("mouse_exited", callable_mp(this, &EditorSpinSlider::_grabber_mouse_exited));
|
||||||
grabber->connect("gui_input", callable_mp(this, &EditorSpinSlider::_grabber_gui_input));
|
grabber->connect("gui_input", callable_mp(this, &EditorSpinSlider::_grabber_gui_input));
|
||||||
mouse_over_spin = false;
|
|
||||||
mouse_over_grabber = false;
|
|
||||||
mousewheel_over_grabber = false;
|
|
||||||
grabbing_grabber = false;
|
|
||||||
grabber_range = 1;
|
grabber_range = 1;
|
||||||
value_input_just_closed = false;
|
|
||||||
hide_slider = false;
|
|
||||||
read_only = false;
|
|
||||||
}
|
}
|
||||||
|
@ -41,24 +41,24 @@ class EditorSpinSlider : public Range {
|
|||||||
String label;
|
String label;
|
||||||
String suffix;
|
String suffix;
|
||||||
int updown_offset;
|
int updown_offset;
|
||||||
bool hover_updown;
|
bool hover_updown = false;
|
||||||
bool mouse_hover;
|
bool mouse_hover = false;
|
||||||
|
|
||||||
TextureRect *grabber;
|
TextureRect *grabber;
|
||||||
int grabber_range;
|
int grabber_range;
|
||||||
|
|
||||||
bool mouse_over_spin;
|
bool mouse_over_spin = false;
|
||||||
bool mouse_over_grabber;
|
bool mouse_over_grabber = false;
|
||||||
bool mousewheel_over_grabber;
|
bool mousewheel_over_grabber = false;
|
||||||
|
|
||||||
bool grabbing_grabber;
|
bool grabbing_grabber = false;
|
||||||
int grabbing_from;
|
int grabbing_from;
|
||||||
float grabbing_ratio;
|
float grabbing_ratio;
|
||||||
|
|
||||||
bool grabbing_spinner_attempt;
|
bool grabbing_spinner_attempt = false;
|
||||||
bool grabbing_spinner;
|
bool grabbing_spinner = false;
|
||||||
|
|
||||||
bool read_only;
|
bool read_only = false;
|
||||||
float grabbing_spinner_dist_cache;
|
float grabbing_spinner_dist_cache;
|
||||||
Vector2 grabbing_spinner_mouse_pos;
|
Vector2 grabbing_spinner_mouse_pos;
|
||||||
double pre_grab_value;
|
double pre_grab_value;
|
||||||
@ -73,8 +73,8 @@ class EditorSpinSlider : public Range {
|
|||||||
void _value_input_submitted(const String &);
|
void _value_input_submitted(const String &);
|
||||||
void _value_focus_exited();
|
void _value_focus_exited();
|
||||||
void _value_input_gui_input(const Ref<InputEvent> &p_event);
|
void _value_input_gui_input(const Ref<InputEvent> &p_event);
|
||||||
bool hide_slider;
|
bool hide_slider = false;
|
||||||
bool flat;
|
bool flat = false;
|
||||||
|
|
||||||
void _evaluate_input_text();
|
void _evaluate_input_text();
|
||||||
|
|
||||||
|
@ -153,7 +153,6 @@ String EditorVCSInterface::get_vcs_name() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditorVCSInterface::EditorVCSInterface() {
|
EditorVCSInterface::EditorVCSInterface() {
|
||||||
is_initialized = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EditorVCSInterface::~EditorVCSInterface() {
|
EditorVCSInterface::~EditorVCSInterface() {
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
class EditorVCSInterface : public Object {
|
class EditorVCSInterface : public Object {
|
||||||
GDCLASS(EditorVCSInterface, Object)
|
GDCLASS(EditorVCSInterface, Object)
|
||||||
|
|
||||||
bool is_initialized;
|
bool is_initialized = false;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static EditorVCSInterface *singleton;
|
static EditorVCSInterface *singleton;
|
||||||
|
@ -3172,10 +3172,7 @@ FileSystemDock::FileSystemDock() {
|
|||||||
searched_string = String();
|
searched_string = String();
|
||||||
uncollapsed_paths_before_search = Vector<String>();
|
uncollapsed_paths_before_search = Vector<String>();
|
||||||
|
|
||||||
updating_tree = false;
|
|
||||||
tree_update_id = 0;
|
tree_update_id = 0;
|
||||||
initialized = false;
|
|
||||||
import_dock_needs_update = false;
|
|
||||||
|
|
||||||
history_pos = 0;
|
history_pos = 0;
|
||||||
history_max_size = 20;
|
history_max_size = 20;
|
||||||
@ -3184,8 +3181,6 @@ FileSystemDock::FileSystemDock() {
|
|||||||
display_mode = DISPLAY_MODE_TREE_ONLY;
|
display_mode = DISPLAY_MODE_TREE_ONLY;
|
||||||
old_display_mode = DISPLAY_MODE_TREE_ONLY;
|
old_display_mode = DISPLAY_MODE_TREE_ONLY;
|
||||||
file_list_display_mode = FILE_LIST_DISPLAY_THUMBNAILS;
|
file_list_display_mode = FILE_LIST_DISPLAY_THUMBNAILS;
|
||||||
|
|
||||||
always_show_folders = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
FileSystemDock::~FileSystemDock() {
|
FileSystemDock::~FileSystemDock() {
|
||||||
|
@ -154,7 +154,7 @@ private:
|
|||||||
ShaderCreateDialog *make_shader_dialog;
|
ShaderCreateDialog *make_shader_dialog;
|
||||||
CreateDialog *new_resource_dialog;
|
CreateDialog *new_resource_dialog;
|
||||||
|
|
||||||
bool always_show_folders;
|
bool always_show_folders = false;
|
||||||
|
|
||||||
class FileOrFolder {
|
class FileOrFolder {
|
||||||
public:
|
public:
|
||||||
@ -177,13 +177,13 @@ private:
|
|||||||
|
|
||||||
String path;
|
String path;
|
||||||
|
|
||||||
bool initialized;
|
bool initialized = false;
|
||||||
|
|
||||||
bool updating_tree;
|
bool updating_tree = false;
|
||||||
int tree_update_id;
|
int tree_update_id;
|
||||||
Tree *tree;
|
Tree *tree;
|
||||||
ItemList *files;
|
ItemList *files;
|
||||||
bool import_dock_needs_update;
|
bool import_dock_needs_update = false;
|
||||||
|
|
||||||
bool holding_branch = false;
|
bool holding_branch = false;
|
||||||
Vector<TreeItem *> tree_items_selected_on_drag_begin;
|
Vector<TreeItem *> tree_items_selected_on_drag_begin;
|
||||||
|
@ -612,8 +612,6 @@ FindInFilesPanel::FindInFilesPanel() {
|
|||||||
_results_display->create_item(); // Root
|
_results_display->create_item(); // Root
|
||||||
vbc->add_child(_results_display);
|
vbc->add_child(_results_display);
|
||||||
|
|
||||||
_with_replace = false;
|
|
||||||
|
|
||||||
{
|
{
|
||||||
_replace_container = memnew(HBoxContainer);
|
_replace_container = memnew(HBoxContainer);
|
||||||
|
|
||||||
|
@ -210,7 +210,7 @@ private:
|
|||||||
ProgressBar *_progress_bar;
|
ProgressBar *_progress_bar;
|
||||||
Map<String, TreeItem *> _file_items;
|
Map<String, TreeItem *> _file_items;
|
||||||
Map<TreeItem *, Result> _result_items;
|
Map<TreeItem *, Result> _result_items;
|
||||||
bool _with_replace;
|
bool _with_replace = false;
|
||||||
|
|
||||||
HBoxContainer *_replace_container;
|
HBoxContainer *_replace_container;
|
||||||
LineEdit *_replace_line_edit;
|
LineEdit *_replace_line_edit;
|
||||||
|
@ -473,7 +473,6 @@ void LocalizationEditor::_bind_methods() {
|
|||||||
|
|
||||||
LocalizationEditor::LocalizationEditor() {
|
LocalizationEditor::LocalizationEditor() {
|
||||||
undo_redo = EditorNode::get_undo_redo();
|
undo_redo = EditorNode::get_undo_redo();
|
||||||
updating_translations = false;
|
|
||||||
localization_changed = "localization_changed";
|
localization_changed = "localization_changed";
|
||||||
|
|
||||||
TabContainer *translations = memnew(TabContainer);
|
TabContainer *translations = memnew(TabContainer);
|
||||||
|
@ -56,7 +56,7 @@ class LocalizationEditor : public VBoxContainer {
|
|||||||
EditorFileDialog *pot_generate_dialog;
|
EditorFileDialog *pot_generate_dialog;
|
||||||
|
|
||||||
UndoRedo *undo_redo;
|
UndoRedo *undo_redo;
|
||||||
bool updating_translations;
|
bool updating_translations = false;
|
||||||
String localization_changed;
|
String localization_changed;
|
||||||
|
|
||||||
void _translation_file_open();
|
void _translation_file_open();
|
||||||
|
@ -1128,9 +1128,6 @@ ProjectExportDialog::ProjectExportDialog() {
|
|||||||
|
|
||||||
// Script export parameters.
|
// Script export parameters.
|
||||||
|
|
||||||
updating_script_key = false;
|
|
||||||
updating_enc_filters = false;
|
|
||||||
|
|
||||||
VBoxContainer *sec_vb = memnew(VBoxContainer);
|
VBoxContainer *sec_vb = memnew(VBoxContainer);
|
||||||
sec_vb->set_name(TTR("Encryption"));
|
sec_vb->set_name(TTR("Encryption"));
|
||||||
|
|
||||||
@ -1195,8 +1192,6 @@ ProjectExportDialog::ProjectExportDialog() {
|
|||||||
|
|
||||||
// Export buttons, dialogs and errors.
|
// Export buttons, dialogs and errors.
|
||||||
|
|
||||||
updating = false;
|
|
||||||
|
|
||||||
get_cancel_button()->set_text(TTR("Close"));
|
get_cancel_button()->set_text(TTR("Close"));
|
||||||
get_ok_button()->set_text(TTR("Export PCK/ZIP..."));
|
get_ok_button()->set_text(TTR("Export PCK/ZIP..."));
|
||||||
export_button = add_button(TTR("Export Project..."), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "export");
|
export_button = add_button(TTR("Export Project..."), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "export");
|
||||||
|
@ -71,7 +71,7 @@ private:
|
|||||||
CheckButton *runnable;
|
CheckButton *runnable;
|
||||||
|
|
||||||
Button *button_export;
|
Button *button_export;
|
||||||
bool updating;
|
bool updating = false;
|
||||||
|
|
||||||
AcceptDialog *error_dialog;
|
AcceptDialog *error_dialog;
|
||||||
ConfirmationDialog *delete_confirm;
|
ConfirmationDialog *delete_confirm;
|
||||||
@ -152,8 +152,8 @@ private:
|
|||||||
void _update_feature_list();
|
void _update_feature_list();
|
||||||
void _custom_features_changed(const String &p_text);
|
void _custom_features_changed(const String &p_text);
|
||||||
|
|
||||||
bool updating_script_key;
|
bool updating_script_key = false;
|
||||||
bool updating_enc_filters;
|
bool updating_enc_filters = false;
|
||||||
void _enc_pck_changed(bool p_pressed);
|
void _enc_pck_changed(bool p_pressed);
|
||||||
void _enc_directory_changed(bool p_pressed);
|
void _enc_directory_changed(bool p_pressed);
|
||||||
void _enc_filters_changed(const String &p_text);
|
void _enc_filters_changed(const String &p_text);
|
||||||
|
@ -1771,9 +1771,6 @@ void CustomPropertyEditor::_bind_methods() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CustomPropertyEditor::CustomPropertyEditor() {
|
CustomPropertyEditor::CustomPropertyEditor() {
|
||||||
read_only = false;
|
|
||||||
updating = false;
|
|
||||||
|
|
||||||
value_vbox = memnew(VBoxContainer);
|
value_vbox = memnew(VBoxContainer);
|
||||||
add_child(value_vbox);
|
add_child(value_vbox);
|
||||||
|
|
||||||
|
@ -119,7 +119,7 @@ class CustomPropertyEditor : public PopupPanel {
|
|||||||
TextureRect *texture_preview;
|
TextureRect *texture_preview;
|
||||||
ColorPicker *color_picker;
|
ColorPicker *color_picker;
|
||||||
TextEdit *text_edit;
|
TextEdit *text_edit;
|
||||||
bool read_only;
|
bool read_only = false;
|
||||||
bool picking_viewport;
|
bool picking_viewport;
|
||||||
GridContainer *checks20gc;
|
GridContainer *checks20gc;
|
||||||
CheckBox *checks20[20];
|
CheckBox *checks20[20];
|
||||||
@ -132,7 +132,7 @@ class CustomPropertyEditor : public PopupPanel {
|
|||||||
|
|
||||||
Object *owner;
|
Object *owner;
|
||||||
|
|
||||||
bool updating;
|
bool updating = false;
|
||||||
|
|
||||||
PropertyValueEvaluator *evaluator;
|
PropertyValueEvaluator *evaluator;
|
||||||
|
|
||||||
|
@ -589,7 +589,6 @@ PropertySelector::PropertySelector() {
|
|||||||
search_options->connect("cell_selected", callable_mp(this, &PropertySelector::_item_selected));
|
search_options->connect("cell_selected", callable_mp(this, &PropertySelector::_item_selected));
|
||||||
search_options->set_hide_root(true);
|
search_options->set_hide_root(true);
|
||||||
search_options->set_hide_folding(true);
|
search_options->set_hide_folding(true);
|
||||||
virtuals_only = false;
|
|
||||||
|
|
||||||
help_bit = memnew(EditorHelpBit);
|
help_bit = memnew(EditorHelpBit);
|
||||||
vbc->add_margin_child(TTR("Description:"), help_bit);
|
vbc->add_margin_child(TTR("Description:"), help_bit);
|
||||||
|
@ -56,7 +56,7 @@ class PropertySelector : public ConfirmationDialog {
|
|||||||
String base_type;
|
String base_type;
|
||||||
ObjectID script;
|
ObjectID script;
|
||||||
Object *instance;
|
Object *instance;
|
||||||
bool virtuals_only;
|
bool virtuals_only = false;
|
||||||
|
|
||||||
Vector<Variant::Type> type_filter;
|
Vector<Variant::Type> type_filter;
|
||||||
|
|
||||||
|
@ -245,8 +245,6 @@ void EditorQuickOpen::_bind_methods() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditorQuickOpen::EditorQuickOpen() {
|
EditorQuickOpen::EditorQuickOpen() {
|
||||||
allow_multi_select = false;
|
|
||||||
|
|
||||||
VBoxContainer *vbc = memnew(VBoxContainer);
|
VBoxContainer *vbc = memnew(VBoxContainer);
|
||||||
vbc->connect("theme_changed", callable_mp(this, &EditorQuickOpen::_theme_changed));
|
vbc->connect("theme_changed", callable_mp(this, &EditorQuickOpen::_theme_changed));
|
||||||
add_child(vbc);
|
add_child(vbc);
|
||||||
|
@ -42,7 +42,7 @@ class EditorQuickOpen : public ConfirmationDialog {
|
|||||||
LineEdit *search_box;
|
LineEdit *search_box;
|
||||||
Tree *search_options;
|
Tree *search_options;
|
||||||
StringName base_type;
|
StringName base_type;
|
||||||
bool allow_multi_select;
|
bool allow_multi_select = false;
|
||||||
|
|
||||||
Vector<String> files;
|
Vector<String> files;
|
||||||
OAHashMap<String, Ref<Texture2D>> icons;
|
OAHashMap<String, Ref<Texture2D>> icons;
|
||||||
|
@ -3497,8 +3497,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
|
|||||||
menu_subresources->set_name("Sub-Resources");
|
menu_subresources->set_name("Sub-Resources");
|
||||||
menu_subresources->connect("id_pressed", callable_mp(this, &SceneTreeDock::_tool_selected), make_binds(false));
|
menu_subresources->connect("id_pressed", callable_mp(this, &SceneTreeDock::_tool_selected), make_binds(false));
|
||||||
menu->add_child(menu_subresources);
|
menu->add_child(menu_subresources);
|
||||||
first_enter = true;
|
|
||||||
restore_script_editor_on_drag = false;
|
|
||||||
|
|
||||||
menu_properties = memnew(PopupMenu);
|
menu_properties = memnew(PopupMenu);
|
||||||
add_child(menu_properties);
|
add_child(menu_properties);
|
||||||
@ -3512,9 +3510,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
|
|||||||
set_process_input(true);
|
set_process_input(true);
|
||||||
set_process(true);
|
set_process(true);
|
||||||
|
|
||||||
profile_allow_editing = true;
|
|
||||||
profile_allow_script_editing = true;
|
|
||||||
|
|
||||||
EDITOR_DEF("interface/editors/show_scene_tree_root_selection", true);
|
EDITOR_DEF("interface/editors/show_scene_tree_root_selection", true);
|
||||||
EDITOR_DEF("interface/editors/derive_script_globals_by_name", true);
|
EDITOR_DEF("interface/editors/derive_script_globals_by_name", true);
|
||||||
EDITOR_DEF("_use_favorites_root_selection", false);
|
EDITOR_DEF("_use_favorites_root_selection", false);
|
||||||
|
@ -105,7 +105,7 @@ class SceneTreeDock : public VBoxContainer {
|
|||||||
|
|
||||||
Vector<ObjectID> subresources;
|
Vector<ObjectID> subresources;
|
||||||
|
|
||||||
bool restore_script_editor_on_drag;
|
bool restore_script_editor_on_drag = false;
|
||||||
bool reset_create_dialog = false;
|
bool reset_create_dialog = false;
|
||||||
|
|
||||||
int current_option;
|
int current_option;
|
||||||
@ -166,7 +166,7 @@ class SceneTreeDock : public VBoxContainer {
|
|||||||
PopupMenu *menu_properties;
|
PopupMenu *menu_properties;
|
||||||
ConfirmationDialog *clear_inherit_confirm;
|
ConfirmationDialog *clear_inherit_confirm;
|
||||||
|
|
||||||
bool first_enter;
|
bool first_enter = true;
|
||||||
|
|
||||||
void _create();
|
void _create();
|
||||||
void _do_create(Node *p_parent);
|
void _do_create(Node *p_parent);
|
||||||
@ -261,8 +261,8 @@ class SceneTreeDock : public VBoxContainer {
|
|||||||
void _create_remap_for_node(Node *p_node, Map<RES, RES> &r_remap);
|
void _create_remap_for_node(Node *p_node, Map<RES, RES> &r_remap);
|
||||||
void _create_remap_for_resource(RES p_resource, Map<RES, RES> &r_remap);
|
void _create_remap_for_resource(RES p_resource, Map<RES, RES> &r_remap);
|
||||||
|
|
||||||
bool profile_allow_editing;
|
bool profile_allow_editing = true;
|
||||||
bool profile_allow_script_editing;
|
bool profile_allow_script_editing = true;
|
||||||
|
|
||||||
static void _update_configuration_warning();
|
static void _update_configuration_warning();
|
||||||
|
|
||||||
|
@ -1197,17 +1197,11 @@ void SceneTreeEditor::_bind_methods() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SceneTreeEditor::SceneTreeEditor(bool p_label, bool p_can_rename, bool p_can_open_instance) {
|
SceneTreeEditor::SceneTreeEditor(bool p_label, bool p_can_rename, bool p_can_open_instance) {
|
||||||
connect_to_script_mode = false;
|
|
||||||
connecting_signal = false;
|
|
||||||
undo_redo = nullptr;
|
undo_redo = nullptr;
|
||||||
tree_dirty = true;
|
|
||||||
selected = nullptr;
|
selected = nullptr;
|
||||||
|
|
||||||
marked_selectable = false;
|
|
||||||
marked_children_selectable = false;
|
|
||||||
can_rename = p_can_rename;
|
can_rename = p_can_rename;
|
||||||
can_open_instance = p_can_open_instance;
|
can_open_instance = p_can_open_instance;
|
||||||
display_foreign = false;
|
|
||||||
editor_selection = nullptr;
|
editor_selection = nullptr;
|
||||||
|
|
||||||
if (p_label) {
|
if (p_label) {
|
||||||
@ -1249,11 +1243,7 @@ SceneTreeEditor::SceneTreeEditor(bool p_label, bool p_can_rename, bool p_can_ope
|
|||||||
add_child(warning);
|
add_child(warning);
|
||||||
warning->set_title(TTR("Node Configuration Warning!"));
|
warning->set_title(TTR("Node Configuration Warning!"));
|
||||||
|
|
||||||
show_enabled_subscene = false;
|
|
||||||
|
|
||||||
last_hash = 0;
|
last_hash = 0;
|
||||||
pending_test_update = false;
|
|
||||||
updating_tree = false;
|
|
||||||
blocked = 0;
|
blocked = 0;
|
||||||
|
|
||||||
update_timer = memnew(Timer);
|
update_timer = memnew(Timer);
|
||||||
|
@ -65,8 +65,8 @@ class SceneTreeEditor : public Control {
|
|||||||
AcceptDialog *warning;
|
AcceptDialog *warning;
|
||||||
|
|
||||||
bool auto_expand_selected = true;
|
bool auto_expand_selected = true;
|
||||||
bool connect_to_script_mode;
|
bool connect_to_script_mode = false;
|
||||||
bool connecting_signal;
|
bool connecting_signal = false;
|
||||||
|
|
||||||
int blocked;
|
int blocked;
|
||||||
|
|
||||||
@ -92,18 +92,18 @@ class SceneTreeEditor : public Control {
|
|||||||
|
|
||||||
bool can_rename;
|
bool can_rename;
|
||||||
bool can_open_instance;
|
bool can_open_instance;
|
||||||
bool updating_tree;
|
bool updating_tree = false;
|
||||||
bool show_enabled_subscene;
|
bool show_enabled_subscene = false;
|
||||||
|
|
||||||
void _renamed();
|
void _renamed();
|
||||||
UndoRedo *undo_redo;
|
UndoRedo *undo_redo;
|
||||||
|
|
||||||
Set<Node *> marked;
|
Set<Node *> marked;
|
||||||
bool marked_selectable;
|
bool marked_selectable = false;
|
||||||
bool marked_children_selectable;
|
bool marked_children_selectable = false;
|
||||||
bool display_foreign;
|
bool display_foreign = false;
|
||||||
bool tree_dirty;
|
bool tree_dirty = true;
|
||||||
bool pending_test_update;
|
bool pending_test_update = false;
|
||||||
static void _bind_methods();
|
static void _bind_methods();
|
||||||
|
|
||||||
void _cell_button_pressed(Object *p_item, int p_column, int p_id);
|
void _cell_button_pressed(Object *p_item, int p_column, int p_id);
|
||||||
|
@ -1026,7 +1026,6 @@ ScriptCreateDialog::ScriptCreateDialog() {
|
|||||||
hb->add_child(parent_browse_button);
|
hb->add_child(parent_browse_button);
|
||||||
gc->add_child(memnew(Label(TTR("Inherits:"))));
|
gc->add_child(memnew(Label(TTR("Inherits:"))));
|
||||||
gc->add_child(hb);
|
gc->add_child(hb);
|
||||||
is_browsing_parent = false;
|
|
||||||
|
|
||||||
/* Class Name */
|
/* Class Name */
|
||||||
|
|
||||||
@ -1037,8 +1036,6 @@ ScriptCreateDialog::ScriptCreateDialog() {
|
|||||||
gc->add_child(class_name);
|
gc->add_child(class_name);
|
||||||
|
|
||||||
/* Templates */
|
/* Templates */
|
||||||
|
|
||||||
is_using_templates = true;
|
|
||||||
gc->add_child(memnew(Label(TTR("Template:"))));
|
gc->add_child(memnew(Label(TTR("Template:"))));
|
||||||
HBoxContainer *template_hb = memnew(HBoxContainer);
|
HBoxContainer *template_hb = memnew(HBoxContainer);
|
||||||
template_hb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
template_hb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
@ -1079,7 +1076,6 @@ ScriptCreateDialog::ScriptCreateDialog() {
|
|||||||
Label *label = memnew(Label(TTR("Path:")));
|
Label *label = memnew(Label(TTR("Path:")));
|
||||||
gc->add_child(label);
|
gc->add_child(label);
|
||||||
gc->add_child(hb);
|
gc->add_child(hb);
|
||||||
re_check_path = false;
|
|
||||||
path_controls[0] = label;
|
path_controls[0] = label;
|
||||||
path_controls[1] = hb;
|
path_controls[1] = hb;
|
||||||
|
|
||||||
@ -1116,17 +1112,4 @@ ScriptCreateDialog::ScriptCreateDialog() {
|
|||||||
|
|
||||||
set_hide_on_ok(false);
|
set_hide_on_ok(false);
|
||||||
set_title(TTR("Attach Node Script"));
|
set_title(TTR("Attach Node Script"));
|
||||||
|
|
||||||
is_parent_name_valid = false;
|
|
||||||
is_class_name_valid = false;
|
|
||||||
is_path_valid = false;
|
|
||||||
|
|
||||||
has_named_classes = false;
|
|
||||||
supports_built_in = false;
|
|
||||||
can_inherit_from_file = false;
|
|
||||||
is_built_in = false;
|
|
||||||
built_in_enabled = true;
|
|
||||||
load_enabled = true;
|
|
||||||
|
|
||||||
is_new_script_created = true;
|
|
||||||
}
|
}
|
||||||
|
@ -66,25 +66,23 @@ class ScriptCreateDialog : public ConfirmationDialog {
|
|||||||
VBoxContainer *path_vb;
|
VBoxContainer *path_vb;
|
||||||
AcceptDialog *alert;
|
AcceptDialog *alert;
|
||||||
CreateDialog *select_class;
|
CreateDialog *select_class;
|
||||||
bool path_valid;
|
bool is_browsing_parent = false;
|
||||||
bool create_new;
|
|
||||||
bool is_browsing_parent;
|
|
||||||
String template_inactive_message;
|
String template_inactive_message;
|
||||||
String initial_bp;
|
String initial_bp;
|
||||||
bool is_new_script_created;
|
bool is_new_script_created = true;
|
||||||
bool is_path_valid;
|
bool is_path_valid = false;
|
||||||
bool has_named_classes;
|
bool has_named_classes = false;
|
||||||
bool supports_built_in;
|
bool supports_built_in = false;
|
||||||
bool can_inherit_from_file;
|
bool can_inherit_from_file = false;
|
||||||
bool is_parent_name_valid;
|
bool is_parent_name_valid = false;
|
||||||
bool is_class_name_valid;
|
bool is_class_name_valid = false;
|
||||||
bool is_built_in;
|
bool is_built_in = false;
|
||||||
bool is_using_templates;
|
bool is_using_templates = true;
|
||||||
bool built_in_enabled;
|
bool built_in_enabled = true;
|
||||||
bool load_enabled;
|
bool load_enabled = true;
|
||||||
int current_language;
|
int current_language;
|
||||||
int default_language;
|
int default_language;
|
||||||
bool re_check_path;
|
bool re_check_path = false;
|
||||||
|
|
||||||
Control *path_controls[2];
|
Control *path_controls[2];
|
||||||
Control *name_controls[2];
|
Control *name_controls[2];
|
||||||
|
@ -4725,8 +4725,6 @@ VisualScriptEditor::VisualScriptEditor() {
|
|||||||
|
|
||||||
undo_redo = EditorNode::get_singleton()->get_undo_redo();
|
undo_redo = EditorNode::get_singleton()->get_undo_redo();
|
||||||
|
|
||||||
updating_members = false;
|
|
||||||
|
|
||||||
set_process_input(true);
|
set_process_input(true);
|
||||||
|
|
||||||
default_value_edit = memnew(CustomPropertyEditor);
|
default_value_edit = memnew(CustomPropertyEditor);
|
||||||
|
@ -148,7 +148,7 @@ class VisualScriptEditor : public ScriptEditorBase {
|
|||||||
void _update_graph_connections();
|
void _update_graph_connections();
|
||||||
void _update_graph(int p_only_id = -1);
|
void _update_graph(int p_only_id = -1);
|
||||||
|
|
||||||
bool updating_members;
|
bool updating_members = false;
|
||||||
|
|
||||||
void _update_members();
|
void _update_members();
|
||||||
String _sanitized_variant_text(const StringName &property_name);
|
String _sanitized_variant_text(const StringName &property_name);
|
||||||
|
Loading…
Reference in New Issue
Block a user