Sara/this-city
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: updated engine

Browse source
This commit is contained in:
Sara Gerretsen 2026-07-10 17:04:34 +02:00
parent cbe99774ff
commit f4cf6b3999
6607 changed files with 910135 additions and 430025 deletions
Download patch file Download diff file Expand all files Collapse all files

29
engine/editor/settings/action_map_editor.cpp
View file

@ -30,6 +30,7 @@
#include "action_map_editor.h"
#include "core/object/callable_mp.h"
#include "editor/editor_string_names.h"
#include "editor/settings/editor_event_search_bar.h"
#include "editor/settings/editor_settings.h"
@ -170,7 +171,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(Ref<InputEvent>(), current_action_name);
event_config_dialog->popup_and_configure(Ref<InputEvent>(), current_action_name, current_action);
} break;
case ActionMapEditor::BUTTON_EDIT_EVENT: {
// Action and Action name is located on the parent of the event.
@ -181,7 +182,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, current_action_name);
event_config_dialog->popup_and_configure(ie, current_action_name, current_action);
}
} break;
case ActionMapEditor::BUTTON_REMOVE_ACTION: {
@ -527,7 +528,27 @@ void ActionMapEditor::update_action_list(const Vector<ActionInfo> &p_action_info
Ref<InputEventMouseButton> mb = event;
if (mb.is_valid()) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("Mouse")));
if (mb->get_button_index() == MouseButton::LEFT) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("MouseButtonLeft")));
} else if (mb->get_button_index() == MouseButton::RIGHT) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("MouseButtonRight")));
} else if (mb->get_button_index() == MouseButton::MIDDLE) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("MouseButtonMiddle")));
} else if (mb->get_button_index() == MouseButton::WHEEL_UP) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("MouseButtonWheelUp")));
} else if (mb->get_button_index() == MouseButton::WHEEL_DOWN) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("MouseButtonWheelDown")));
} else if (mb->get_button_index() == MouseButton::WHEEL_LEFT) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("MouseButtonWheelLeft")));
} else if (mb->get_button_index() == MouseButton::WHEEL_RIGHT) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("MouseButtonWheelRight")));
} else if (mb->get_button_index() == MouseButton::MB_XBUTTON1) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("MouseButtonXButton1")));
} else if (mb->get_button_index() == MouseButton::MB_XBUTTON2) {
event_item->set_icon(0, get_editor_theme_icon(SNAME("MouseButtonXButton2")));
} else {
event_item->set_icon(0, get_editor_theme_icon(SNAME("Mouse")));
}
}
Ref<InputEventJoypadButton> jb = event;
@ -603,7 +624,7 @@ ActionMapEditor::ActionMapEditor() {
MarginContainer *mc = memnew(MarginContainer);
mc->set_v_size_flags(Control::SIZE_EXPAND_FILL);
mc->set_theme_type_variation("NoBorderHorizontalBottom");
mc->set_theme_type_variation("NoBorderActionEditor");
main_vbox->add_child(mc);
// Action Editor Tree