From 4618b665d8cef0080881cee6c84f197ba800256f Mon Sep 17 00:00:00 2001 From: Anna Date: Mon, 22 Nov 2021 23:23:56 -0500 Subject: [PATCH] feat: allow ctrl- or middle-click --- Glamaholic/Ui/MainInterface.cs | 4 ++-- Glamaholic/Util.cs | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Glamaholic/Ui/MainInterface.cs b/Glamaholic/Ui/MainInterface.cs index 210a623..ef26332 100755 --- a/Glamaholic/Ui/MainInterface.cs +++ b/Glamaholic/Ui/MainInterface.cs @@ -416,7 +416,7 @@ namespace Glamaholic.Ui { ImGui.CloseCurrentPopup(); } - if (ImGui.IsItemClicked(ImGuiMouseButton.Middle)) { + if (Util.IsItemMiddleOrCtrlClicked()) { this.Ui.AlternativeFinders.Add(new AlternativeFinder(this.Ui, item)); } } @@ -521,7 +521,7 @@ namespace Glamaholic.Ui { } } - if (mirage != null && mirage.ItemId != 0 && ImGui.IsItemClicked(ImGuiMouseButton.Middle)) { + if (mirage != null && mirage.ItemId != 0 && Util.IsItemMiddleOrCtrlClicked()) { var item = this.Ui.Plugin.DataManager.GetExcelSheet()!.GetRow(mirage.ItemId); if (item != null) { this.Ui.AlternativeFinders.Add(new AlternativeFinder(this.Ui, item)); diff --git a/Glamaholic/Util.cs b/Glamaholic/Util.cs index df9462d..1b2379c 100755 --- a/Glamaholic/Util.cs +++ b/Glamaholic/Util.cs @@ -82,6 +82,14 @@ namespace Glamaholic { }; } + internal static bool IsItemMiddleOrCtrlClicked() { + if (ImGui.IsItemClicked(ImGuiMouseButton.Middle)) { + return true; + } + + return ImGui.GetIO().KeyCtrl && ImGui.IsItemClicked(ImGuiMouseButton.Left); + } + // https://github.com/ufx/GarlandTools/blob/5b2ec54dc792175a1d565fddb6c6b975b9a9ff64/Garland.Data/Hacks.cs#L89 internal static bool IsItemSkipped(Item item) { var name = item.Name.RawString;