godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86280 from Calinou/editor-input-map-editor-action-edit-title 

Add input action name to window title in input map editor
This commit is contained in:
Yuri Sizov 2023-12-18 18:18:24 +01:00
parent 8d9c11b72b 8e2f3191e7
commit bf8dd73e9d
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/action_map_editor.cpp
View File

@ -168,7 +168,7 @@ void ActionMapEditor::_tree_button_pressed(Object *p_item, int p_column, int p_i
current_action_name = item->get_meta("__name");
current_action_event_index = -1;
event_config_dialog->popup_and_configure();
event_config_dialog->popup_and_configure(Ref<InputEvent>(), current_action_name);
} break;
case ActionMapEditor::BUTTON_EDIT_EVENT: {
// Action and Action name is located on the parent of the event.
@ -179,7 +179,7 @@ void ActionMapEditor::_tree_button_pressed(Object *p_item, int p_column, int p_i
Ref<InputEvent> ie = item->get_meta("__event");
if (ie.is_valid()) {
event_config_dialog->popup_and_configure(ie);
event_config_dialog->popup_and_configure(ie, current_action_name);
}
} break;
case ActionMapEditor::BUTTON_REMOVE_ACTION: {

9
editor/input_event_configuration_dialog.cpp
View File

@ -572,7 +572,7 @@ void InputEventConfigurationDialog::_notification(int p_what) {
}
}
void InputEventConfigurationDialog::popup_and_configure(const Ref<InputEvent> &p_event) {
void InputEventConfigurationDialog::popup_and_configure(const Ref<InputEvent> &p_event, const String &p_current_action_name) {
if (p_event.is_valid()) {
_set_event(p_event->duplicate(), p_event);
} else {
@ -596,6 +596,12 @@ void InputEventConfigurationDialog::popup_and_configure(const Ref<InputEvent> &p
device_id_option->select(0);
}
if (!p_current_action_name.is_empty()) {
set_title(vformat(TTR("Event Configuration for \"%s\""), p_current_action_name));
} else {
set_title(TTR("Event Configuration"));
}
popup_centered(Size2(0, 400) * EDSCALE);
}
@ -611,7 +617,6 @@ void InputEventConfigurationDialog::set_allowed_input_types(int p_type_masks) {
InputEventConfigurationDialog::InputEventConfigurationDialog() {
allowed_input_types = INPUT_KEY | INPUT_MOUSE_BUTTON | INPUT_JOY_BUTTON | INPUT_JOY_MOTION;
set_title(TTR("Event Configuration"));
set_min_size(Size2i(550, 0) * EDSCALE);
VBoxContainer *main_vbox = memnew(VBoxContainer);

3
editor/input_event_configuration_dialog.h
View File

@ -120,7 +120,8 @@ protected:
public:
// Pass an existing event to configure it. Alternatively, pass no event to start with a blank configuration.
void popup_and_configure(const Ref<InputEvent> &p_event = Ref<InputEvent>());
// An action name can be passed for descriptive purposes.
void popup_and_configure(const Ref<InputEvent> &p_event = Ref<InputEvent>(), const String &p_current_action_name = "");
Ref<InputEvent> get_event() const;
void set_allowed_input_types(int p_type_masks);