summaryrefslogtreecommitdiffstats
path: root/editor/inspector_dock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'editor/inspector_dock.cpp')
-rw-r--r--editor/inspector_dock.cpp33
1 files changed, 23 insertions, 10 deletions
diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp
index 1ee273f64b..d5be2bd5a9 100644
--- a/editor/inspector_dock.cpp
+++ b/editor/inspector_dock.cpp
@@ -31,7 +31,6 @@
#include "inspector_dock.h"
#include "editor/editor_node.h"
-#include "editor/editor_scale.h"
#include "editor/editor_settings.h"
#include "editor/editor_string_names.h"
#include "editor/editor_undo_redo_manager.h"
@@ -39,6 +38,7 @@
#include "editor/gui/editor_file_dialog.h"
#include "editor/gui/editor_object_selector.h"
#include "editor/plugins/script_editor_plugin.h"
+#include "editor/themes/editor_scale.h"
InspectorDock *InspectorDock::singleton = nullptr;
@@ -461,15 +461,6 @@ void InspectorDock::_notification(int p_what) {
}
void InspectorDock::_bind_methods() {
- ClassDB::bind_method("_unref_resource", &InspectorDock::_unref_resource);
- ClassDB::bind_method("_paste_resource", &InspectorDock::_paste_resource);
- ClassDB::bind_method("_copy_resource", &InspectorDock::_copy_resource);
-
- ClassDB::bind_method("_menu_collapseall", &InspectorDock::_menu_collapseall);
- ClassDB::bind_method("_menu_expandall", &InspectorDock::_menu_expandall);
-
- ClassDB::bind_method("edit_resource", &InspectorDock::edit_resource);
-
ClassDB::bind_method("store_script_properties", &InspectorDock::store_script_properties);
ClassDB::bind_method("apply_script_properties", &InspectorDock::apply_script_properties);
@@ -623,6 +614,26 @@ void InspectorDock::apply_script_properties(Object *p_object) {
stored_properties.clear();
}
+void InspectorDock::shortcut_input(const Ref<InputEvent> &p_event) {
+ ERR_FAIL_COND(p_event.is_null());
+
+ Ref<InputEventKey> key = p_event;
+
+ if (key.is_null() || !key->is_pressed() || key->is_echo()) {
+ return;
+ }
+
+ if (!is_visible() || !inspector->get_rect().has_point(inspector->get_local_mouse_position())) {
+ return;
+ }
+
+ if (ED_IS_SHORTCUT("editor/open_search", p_event)) {
+ search->grab_focus();
+ search->select_all();
+ accept_event();
+ }
+}
+
InspectorDock::InspectorDock(EditorData &p_editor_data) {
singleton = this;
set_name("Inspector");
@@ -779,6 +790,8 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
inspector->set_use_filter(true); // TODO: check me
inspector->connect("resource_selected", callable_mp(this, &InspectorDock::_resource_selected));
+
+ set_process_shortcut_input(true);
}
InspectorDock::~InspectorDock() {