Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@bdf625bd54

Browse Source
This commit is contained in:
Spartan322
2025-01-04 00:55:26 -05:00
parent 106ba51fe4 bdf625bd54
commit 4ffc9ac18b
376 changed files with 3848 additions and 2763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/input_event_configuration_dialog.cpp
View File

@@ -639,7 +639,7 @@ 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_min_size(Size2i(550, 0) * EDSCALE);
set_min_size(Size2i(800, 0) * EDSCALE);
VBoxContainer *main_vbox = memnew(VBoxContainer);
add_child(main_vbox);
@@ -676,7 +676,7 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() {
input_list_tree = memnew(Tree);
input_list_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
input_list_tree->set_custom_minimum_size(Size2(0, 100 * EDSCALE)); // Min height for tree
input_list_tree->set_custom_minimum_size(Size2(0, 300 * EDSCALE)); // Min height for tree
input_list_tree->connect("item_activated", callable_mp(this, &InputEventConfigurationDialog::_input_list_item_activated));
input_list_tree->connect(SceneStringName(item_selected), callable_mp(this, &InputEventConfigurationDialog::_input_list_item_selected));
input_list_tree->set_v_size_flags(Control::SIZE_EXPAND_FILL);