From 2a2419883b63762acc7a686581437d0ce802484e Mon Sep 17 00:00:00 2001 From: Chivalrik Date: Sat, 1 May 2021 13:45:56 +0200 Subject: [PATCH] feat: Instead of toggling PluginInstaller on mode change, toggle via R3. --- Dalamud/Interface/DalamudSettingsWindow.cs | 4 ++-- Dalamud/Interface/InterfaceManager.cs | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dalamud/Interface/DalamudSettingsWindow.cs b/Dalamud/Interface/DalamudSettingsWindow.cs index c350e9e13..8cc68ec80 100644 --- a/Dalamud/Interface/DalamudSettingsWindow.cs +++ b/Dalamud/Interface/DalamudSettingsWindow.cs @@ -23,7 +23,7 @@ namespace Dalamud.Interface { this.dalamud = dalamud; - this.Size = new Vector2(740, 525); + this.Size = new Vector2(740, 550); this.SizeCondition = ImGuiCond.FirstUseEver; this.dalamudMessagesChatType = this.dalamud.Configuration.GeneralChatType; @@ -231,7 +231,7 @@ namespace Dalamud.Interface ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingToggleDockingHint", "This will allow you to fuse and tab plugin windows.")); ImGui.Checkbox(Loc.Localize("DalamudSettingToggleGamepadNavigation", "Enable navigation of ImGui windows via gamepad."), ref this.doGamepad); - ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingToggleGamepadNavigationHint", "This will allow you to toggle between game and ImGui navigation via L1+L3.")); + ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingToggleGamepadNavigationHint", "This will allow you to toggle between game and ImGui navigation via L1+L3.\nToggle the PluginInstaller window via R3 if ImGui navigation is enabled.")); ImGui.EndTabItem(); } diff --git a/Dalamud/Interface/InterfaceManager.cs b/Dalamud/Interface/InterfaceManager.cs index 3209fe9d9..604c95266 100644 --- a/Dalamud/Interface/InterfaceManager.cs +++ b/Dalamud/Interface/InterfaceManager.cs @@ -509,6 +509,11 @@ namespace Dalamud.Interface ImGui.GetIO().NavInputs[(int)ImGuiNavInput.FocusNext] = this.dalamud.ClientState.GamepadState.Raw(GamepadButtons.R1); ImGui.GetIO().NavInputs[(int)ImGuiNavInput.TweakSlow] = this.dalamud.ClientState.GamepadState.Raw(GamepadButtons.L2); ImGui.GetIO().NavInputs[(int)ImGuiNavInput.TweakFast] = this.dalamud.ClientState.GamepadState.Raw(GamepadButtons.R2); + + if (this.dalamud.ClientState.GamepadState.Pressed(GamepadButtons.R3) > 0) + { + this.dalamud.DalamudUi.TogglePluginInstaller(); + } } }