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

Add a flag to EditorResourcePicker to differentiate selection contexts

Browse Source
This commit is contained in:
Yuri Sizov
2021-11-02 14:15:14 +03:00
parent 44a532e99e
commit 5ff11a2c5c
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/EditorResourcePicker.xml
View File

@@ -85,8 +85,9 @@
</signal> </signal>
<signal name="resource_selected"> <signal name="resource_selected">
<argument index="0" name="resource" type="Resource" /> <argument index="0" name="resource" type="Resource" />
<argument index="1" name="edit" type="bool" />
<description> <description>
Emitted when the resource value was set and user clicked to edit it. Emitted when the resource value was set and user clicked to edit it. When [code]edit[/code] is [code]true[/code], the signal was caused by the context menu "Edit" option.
</description> </description>
</signal> </signal>
</signals> </signals>

4
editor/editor_properties.cpp
View File

@@ -2236,8 +2236,8 @@ EditorPropertyRID::EditorPropertyRID() {
////////////// RESOURCE ////////////////////// ////////////// RESOURCE //////////////////////
void EditorPropertyResource::_resource_selected(const RES &p_resource) { void EditorPropertyResource::_resource_selected(const RES &p_resource, bool p_edit) {
if (_can_use_sub_inspector(p_resource)) { if (!p_edit && _can_use_sub_inspector(p_resource)) {
bool unfold = !get_edited_object()->editor_is_section_unfolded(get_edited_property()); bool unfold = !get_edited_object()->editor_is_section_unfolded(get_edited_property());
get_edited_object()->editor_set_section_unfold(get_edited_property(), unfold); get_edited_object()->editor_set_section_unfold(get_edited_property(), unfold);
update_property(); update_property();

2
editor/editor_properties.h
View File

@@ -553,7 +553,7 @@ class EditorPropertyResource : public EditorProperty {
bool updating_theme = false; bool updating_theme = false;
bool opened_editor = false; bool opened_editor = false;
void _resource_selected(const RES &p_resource); void _resource_selected(const RES &p_resource, bool p_edit);
void _resource_changed(const RES &p_resource); void _resource_changed(const RES &p_resource);
void _viewport_selected(const NodePath &p_path); void _viewport_selected(const NodePath &p_path);

6
editor/editor_resource_picker.cpp
View File

@@ -108,7 +108,7 @@ void EditorResourcePicker::_resource_selected() {
return; return;
} }
emit_signal("resource_selected", edited_resource); emit_signal("resource_selected", edited_resource, false);
} }
void EditorResourcePicker::_file_selected(const String &p_path) { void EditorResourcePicker::_file_selected(const String &p_path) {
@@ -267,7 +267,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
case OBJ_MENU_EDIT: { case OBJ_MENU_EDIT: {
if (edited_resource.is_valid()) { if (edited_resource.is_valid()) {
emit_signal("resource_selected", edited_resource); emit_signal("resource_selected", edited_resource, true);
} }
} break; } break;
@@ -694,7 +694,7 @@ void EditorResourcePicker::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editable"), "set_editable", "is_editable"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editable"), "set_editable", "is_editable");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toggle_mode"), "set_toggle_mode", "is_toggle_mode"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toggle_mode"), "set_toggle_mode", "is_toggle_mode");
ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"))); ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"), PropertyInfo(Variant::BOOL, "edit")));
ADD_SIGNAL(MethodInfo("resource_changed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"))); ADD_SIGNAL(MethodInfo("resource_changed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource")));
} }

2
editor/plugins/theme_editor_plugin.cpp
View File

@@ -2606,7 +2606,7 @@ void ThemeTypeEditor::_constant_item_changed(float p_value, String p_item_name)
edited_theme->set_constant(p_item_name, edited_type, int(p_value)); edited_theme->set_constant(p_item_name, edited_type, int(p_value));
} }
void ThemeTypeEditor::_edit_resource_item(RES p_resource) { void ThemeTypeEditor::_edit_resource_item(RES p_resource, bool p_edit) {
EditorNode::get_singleton()->edit_resource(p_resource); EditorNode::get_singleton()->edit_resource(p_resource);
} }

2
editor/plugins/theme_editor_plugin.h
View File

@@ -320,7 +320,7 @@ class ThemeTypeEditor : public MarginContainer {
void _color_item_changed(Color p_value, String p_item_name); void _color_item_changed(Color p_value, String p_item_name);
void _constant_item_changed(float p_value, String p_item_name); void _constant_item_changed(float p_value, String p_item_name);
void _edit_resource_item(RES p_resource); void _edit_resource_item(RES p_resource, bool p_edit);
void _font_item_changed(Ref<Font> p_value, String p_item_name); void _font_item_changed(Ref<Font> p_value, String p_item_name);
void _icon_item_changed(Ref<Texture> p_value, String p_item_name); void _icon_item_changed(Ref<Texture> p_value, String p_item_name);
void _stylebox_item_changed(Ref<StyleBox> p_value, String p_item_name); void _stylebox_item_changed(Ref<StyleBox> p_value, String p_item_name);