ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-19 07:04:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Disallow linking of invalid items.

Browse source
This commit is contained in:
Cara 2020-05-17 14:10:27 +09:30
parent aa58d9258b
commit 94c6546461
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Dalamud/Interface/ItemSearchWindow.cs
View file

@ -161,11 +161,13 @@ namespace Dalamud.Interface
if (ImGui.IsMouseDoubleClicked(0)) if (ImGui.IsMouseDoubleClicked(0))
{ {
OnItemChosen?.Invoke(this, this.searchTask.Result[i]); if (this.selectedItemTex != null){
if (this.closeOnChoose) OnItemChosen?.Invoke(this, this.searchTask.Result[i]);
{ if (this.closeOnChoose)
this.selectedItemTex?.Dispose(); {
isOpen = false; this.selectedItemTex?.Dispose();
isOpen = false;
}
} }
} }
} }
@ -189,14 +191,16 @@ namespace Dalamud.Interface
ImGui.EndChild(); ImGui.EndChild();
// Darken choose button if it shouldn't be clickable // Darken choose button if it shouldn't be clickable
ImGui.PushStyleVar(ImGuiStyleVar.Alpha, this.selectedItemIndex < 0 ? 0.25f : 1); ImGui.PushStyleVar(ImGuiStyleVar.Alpha, this.selectedItemIndex < 0 || this.selectedItemTex == null ? 0.25f : 1);
if (ImGui.Button(Loc.Localize("Choose", "Choose"))) { if (ImGui.Button(Loc.Localize("Choose", "Choose"))) {
try { try {
OnItemChosen?.Invoke(this, this.searchTask.Result[this.selectedItemIndex]); if (this.selectedItemTex != null) {
if (this.closeOnChoose) { OnItemChosen?.Invoke(this, this.searchTask.Result[this.selectedItemIndex]);
this.selectedItemTex?.Dispose(); if (this.closeOnChoose) {
isOpen = false; this.selectedItemTex?.Dispose();
isOpen = false;
}
} }
} catch (Exception ex) { } catch (Exception ex) {
Log.Error($"Exception in Choose: {ex.Message}"); Log.Error($"Exception in Choose: {ex.Message}");
@ -214,6 +218,11 @@ namespace Dalamud.Interface
} }
} }
if (this.selectedItemIndex >= 0 && this.selectedItemTex == null) {
ImGui.SameLine();
ImGui.Text(Loc.Localize("DalamudItemNotLinkable", "This item is not linkable."));
}
ImGui.End(); ImGui.End();
return isOpen; return isOpen;