asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #35819 from Calinou/improve-inputmap-editor-icons

Browse source 
Improve icons in the Input Map editor
This commit is contained in:
Rémi Verschelde 2020-02-10 10:46:37 +01:00 committed by GitHub
commit 6c1f428b32
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
editor/project_settings_editor.cpp
View file

@ -719,9 +719,18 @@ void ProjectSettingsEditor::_update_actions() {
item->set_range(1, action["deadzone"]); item->set_range(1, action["deadzone"]);
item->set_custom_bg_color(1, get_color("prop_subsection", "Editor")); item->set_custom_bg_color(1, get_color("prop_subsection", "Editor"));
const bool is_builtin_input = ProjectSettings::get_singleton()->get_input_presets().find(pi.name) != NULL;
const String tooltip = is_builtin_input ? TTR("Built-in actions can't be removed as they're used for UI navigation.") : TTR("Remove");
item->add_button(2, get_icon("Add", "EditorIcons"), 1, false, TTR("Add Event")); item->add_button(2, get_icon("Add", "EditorIcons"), 1, false, TTR("Add Event"));
if (!ProjectSettings::get_singleton()->get_input_presets().find(pi.name)) { item->add_button(2, get_icon("Remove", "EditorIcons"), 2, false, tooltip);
item->add_button(2, get_icon("Remove", "EditorIcons"), 2, false, TTR("Remove"));
if (is_builtin_input) {
// Built-in action (like `ui_up`). Make the action not removable,
// but still display the button so the "Add" button is at the same
// horizontal position as for custom actions.
item->set_button_disabled(2, 1, true);
} else {
// Not a built-in action. Make the action name editable.
item->set_editable(0, true); item->set_editable(0, true);
} }
@ -747,10 +756,9 @@ void ProjectSettingsEditor::_update_actions() {
if (jb.is_valid()) { if (jb.is_valid()) {
String str = _get_device_string(jb->get_device()) + ", " + TTR("Button") + " " + itos(jb->get_button_index()); String str = _get_device_string(jb->get_device()) + ", " + TTR("Button") + " " + itos(jb->get_button_index());
if (jb->get_button_index() >= 0 && jb->get_button_index() < JOY_BUTTON_MAX) if (jb->get_button_index() >= 0 && jb->get_button_index() < JOY_BUTTON_MAX) {
str += String() + " (" + _button_names[jb->get_button_index()] + ")."; str += String() + " (" + _button_names[jb->get_button_index()] + ")";
else }
str += ".";
action2->set_text(0, str); action2->set_text(0, str);
action2->set_icon(0, get_icon("JoyButton", "EditorIcons")); action2->set_icon(0, get_icon("JoyButton", "EditorIcons"));
@ -761,12 +769,12 @@ void ProjectSettingsEditor::_update_actions() {
if (mb.is_valid()) { if (mb.is_valid()) {
String str = _get_device_string(mb->get_device()) + ", "; String str = _get_device_string(mb->get_device()) + ", ";
switch (mb->get_button_index()) { switch (mb->get_button_index()) {
case BUTTON_LEFT: str += TTR("Left Button."); break; case BUTTON_LEFT: str += TTR("Left Button"); break;
case BUTTON_RIGHT: str += TTR("Right Button."); break; case BUTTON_RIGHT: str += TTR("Right Button"); break;
case BUTTON_MIDDLE: str += TTR("Middle Button."); break; case BUTTON_MIDDLE: str += TTR("Middle Button"); break;
case BUTTON_WHEEL_UP: str += TTR("Wheel Up."); break; case BUTTON_WHEEL_UP: str += TTR("Wheel Up"); break;
case BUTTON_WHEEL_DOWN: str += TTR("Wheel Down."); break; case BUTTON_WHEEL_DOWN: str += TTR("Wheel Down"); break;
default: str += TTR("Button") + " " + itos(mb->get_button_index()) + "."; default: str += vformat(TTR("%d Button"), mb->get_button_index());
} }
action2->set_text(0, str); action2->set_text(0, str);
@ -780,7 +788,7 @@ void ProjectSettingsEditor::_update_actions() {
int ax = jm->get_axis(); int ax = jm->get_axis();
int n = 2 * ax + (jm->get_axis_value() < 0 ? 0 : 1); int n = 2 * ax + (jm->get_axis_value() < 0 ? 0 : 1);
String desc = _axis_names[n]; String desc = _axis_names[n];
String str = _get_device_string(jm->get_device()) + ", " + TTR("Axis") + " " + itos(ax) + " " + (jm->get_axis_value() < 0 ? "-" : "+") + desc + "."; String str = _get_device_string(jm->get_device()) + ", " + TTR("Axis") + " " + itos(ax) + " " + (jm->get_axis_value() < 0 ? "-" : "+") + desc;
action2->set_text(0, str); action2->set_text(0, str);
action2->set_icon(0, get_icon("JoyAxis", "EditorIcons")); action2->set_icon(0, get_icon("JoyAxis", "EditorIcons"));
} }
@ -789,6 +797,10 @@ void ProjectSettingsEditor::_update_actions() {
action2->add_button(2, get_icon("Edit", "EditorIcons"), 3, false, TTR("Edit")); action2->add_button(2, get_icon("Edit", "EditorIcons"), 3, false, TTR("Edit"));
action2->add_button(2, get_icon("Remove", "EditorIcons"), 2, false, TTR("Remove")); action2->add_button(2, get_icon("Remove", "EditorIcons"), 2, false, TTR("Remove"));
// Fade out the individual event buttons slightly to make the
// Add/Remove buttons stand out more.
action2->set_button_color(2, 0, Color(1, 1, 1, 0.75));
action2->set_button_color(2, 1, Color(1, 1, 1, 0.75));
} }
} }