Relintai/ui_extensions
1
0
Fork 0
mirror of https://github.com/Relintai/ui_extensions.git synced 2024-11-14 10:27:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Now the editor is derived from MarginContainer.

Browse Source
This commit is contained in:
Relintai 2020-07-30 21:53:50 +02:00
parent 951ee44d58
commit b44dd952e8
2 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
input_map_editor.cpp
View File

@ -39,7 +39,6 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "scene/gui/margin_container.h" #include "scene/gui/margin_container.h"
#include "scene/gui/tab_container.h"
static const char *_button_names[JOY_BUTTON_MAX] = { static const char *_button_names[JOY_BUTTON_MAX] = {
"DualShock Cross, Xbox A, Nintendo B", "DualShock Cross, Xbox A, Nintendo B",
@ -86,9 +85,11 @@ void InputMapEditor::_notification(int p_what) {
popup_add->add_icon_item(get_icon("Mouse", "EditorIcons"), TTR("Mouse Button"), INPUT_MOUSE_BUTTON); popup_add->add_icon_item(get_icon("Mouse", "EditorIcons"), TTR("Mouse Button"), INPUT_MOUSE_BUTTON);
} break; } break;
case NOTIFICATION_POPUP_HIDE: { case NOTIFICATION_VISIBILITY_CHANGED: {
EditorSettings::get_singleton()->set_project_metadata("dialog_bounds", "project_settings", get_rect()); if (!is_visible()) {
set_process_unhandled_input(false); //EditorSettings::get_singleton()->set_project_metadata("dialog_bounds", "project_settings", get_rect());
set_process_unhandled_input(false);
}
} break; } break;
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
popup_add->set_item_icon(popup_add->get_item_index(INPUT_KEY), get_icon("Keyboard", "EditorIcons")); popup_add->set_item_icon(popup_add->get_item_index(INPUT_KEY), get_icon("Keyboard", "EditorIcons"));
@ -888,11 +889,6 @@ void InputMapEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data,
_settings_changed(); _settings_changed();
} }
TabContainer *InputMapEditor::get_tabs() {
return tab_container;
}
void InputMapEditor::_bind_methods() { void InputMapEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_item_checked"), &InputMapEditor::_item_checked); ClassDB::bind_method(D_METHOD("_item_checked"), &InputMapEditor::_item_checked);
@ -909,42 +905,21 @@ void InputMapEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_settings_prop_edited"), &InputMapEditor::_settings_prop_edited); ClassDB::bind_method(D_METHOD("_settings_prop_edited"), &InputMapEditor::_settings_prop_edited);
ClassDB::bind_method(D_METHOD("_settings_changed"), &InputMapEditor::_settings_changed); ClassDB::bind_method(D_METHOD("_settings_changed"), &InputMapEditor::_settings_changed);
ClassDB::bind_method(D_METHOD("get_tabs"), &InputMapEditor::get_tabs);
ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &InputMapEditor::get_drag_data_fw); ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &InputMapEditor::get_drag_data_fw);
ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &InputMapEditor::can_drop_data_fw); ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &InputMapEditor::can_drop_data_fw);
ClassDB::bind_method(D_METHOD("drop_data_fw"), &InputMapEditor::drop_data_fw); ClassDB::bind_method(D_METHOD("drop_data_fw"), &InputMapEditor::drop_data_fw);
} }
InputMapEditor::InputMapEditor() { InputMapEditor::InputMapEditor() {
set_title(TTR("Project Settings (project.godot)"));
set_resizable(true);
tab_container = memnew(TabContainer);
tab_container->set_tab_align(TabContainer::ALIGN_LEFT);
tab_container->set_use_hidden_tabs_for_min_size(true);
add_child(tab_container);
get_ok()->set_text(TTR("Close"));
set_hide_on_ok(true);
message = memnew(AcceptDialog);
add_child(message);
Control *input_base = memnew(Control);
input_base->set_name(TTR("Input Map"));
tab_container->add_child(input_base);
VBoxContainer *vbc = memnew(VBoxContainer); VBoxContainer *vbc = memnew(VBoxContainer);
input_base->add_child(vbc); add_child(vbc);
vbc->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 0); vbc->set_v_size_flags(SIZE_EXPAND_FILL);
vbc->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 0); vbc->set_h_size_flags(SIZE_EXPAND_FILL);
vbc->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 0);
vbc->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 0);
input_editor = memnew(Tree); input_editor = memnew(Tree);
vbc->add_child(input_editor); vbc->add_child(input_editor);
input_editor->set_v_size_flags(SIZE_EXPAND_FILL); input_editor->set_v_size_flags(SIZE_EXPAND_FILL);
input_editor->set_h_size_flags(SIZE_EXPAND_FILL);
input_editor->set_columns(3); input_editor->set_columns(3);
input_editor->set_column_titles_visible(true); input_editor->set_column_titles_visible(true);
input_editor->set_column_title(0, TTR("Action")); input_editor->set_column_title(0, TTR("Action"));

12
input_map_editor.h
View File

@ -32,15 +32,15 @@
#define INPUT_MAP_EDITOR_H #define INPUT_MAP_EDITOR_H
#include "scene/gui/dialogs.h" #include "scene/gui/dialogs.h"
#include "scene/gui/margin_container.h"
#include "scene/gui/menu_button.h" #include "scene/gui/menu_button.h"
#include "scene/gui/option_button.h" #include "scene/gui/option_button.h"
#include "scene/gui/panel_container.h"
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
#include "scene/gui/tab_container.h"
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
class InputMapEditor : public AcceptDialog { class InputMapEditor : public MarginContainer {
GDCLASS(InputMapEditor, MarginContainer);
GDCLASS(InputMapEditor, AcceptDialog);
enum InputType { enum InputType {
INPUT_KEY, INPUT_KEY,
@ -54,8 +54,6 @@ class InputMapEditor : public AcceptDialog {
SHOW_ONLY_SELECTED_LOCALES, SHOW_ONLY_SELECTED_LOCALES,
}; };
TabContainer *tab_container;
Timer *timer; Timer *timer;
InputType add_type; InputType add_type;
String add_at; String add_at;
@ -110,8 +108,6 @@ protected:
String _get_device_string(int i_device); String _get_device_string(int i_device);
public: public:
TabContainer *get_tabs();
void queue_save(); void queue_save();
InputMapEditor(); InputMapEditor();