Skip to content

Commit 8aebd44

Browse files
committed
Add option to disable conflicts from conflict panel.
1 parent 2c06506 commit 8aebd44

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

Penumbra/UI/ModsTab/ModPanelConflictsTab.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public void DrawContent()
3838
{
3939
if (ImGui.Selectable(conflict.Mod2.Name) && conflict.Mod2 is Mod otherMod)
4040
_selector.SelectByValue(otherMod);
41+
var hovered = ImGui.IsItemHovered();
42+
var rightClicked = ImGui.IsItemClicked(ImGuiMouseButton.Right);
4143

4244
ImGui.SameLine();
4345
using (var color = ImRaii.PushColor(ImGuiCol.Text,
@@ -47,6 +49,16 @@ public void DrawContent()
4749
? conflict.Mod2.Priority
4850
: _collectionManager.Active.Current[conflict.Mod2.Index].Settings!.Priority;
4951
ImGui.TextUnformatted($"(Priority {priority})");
52+
hovered |= ImGui.IsItemHovered();
53+
rightClicked |= ImGui.IsItemClicked(ImGuiMouseButton.Right);
54+
}
55+
56+
if (conflict.Mod2 is Mod otherMod2)
57+
{
58+
if (hovered)
59+
ImGui.SetTooltip("Click to jump to mod, Control + Right-Click to disable mod.");
60+
if (rightClicked && ImGui.GetIO().KeyCtrl)
61+
_collectionManager.Editor.SetModState(_collectionManager.Active.Current, otherMod2, false);
5062
}
5163

5264
using var indent = ImRaii.PushIndent(30f);

0 commit comments

Comments
 (0)