From b2f9aebf1f9b896c707a164f7a0681ef06224abc Mon Sep 17 00:00:00 2001 From: Cara Date: Sun, 3 May 2020 23:54:53 +0930 Subject: [PATCH 1/2] Allow xlitem searching from command --- Dalamud/Dalamud.cs | 2 +- Dalamud/Interface/ItemSearchWindow.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs index cb35b6fc7..3d39a07ab 100644 --- a/Dalamud/Dalamud.cs +++ b/Dalamud/Dalamud.cs @@ -559,7 +559,7 @@ namespace Dalamud { private bool isImguiDrawItemSearchWindow; private void OnItemLinkCommand(string command, string arguments) { - this.itemSearchCommandWindow = new ItemSearchWindow(this.Data, new UiBuilder(this.InterfaceManager, "ItemSearcher"), false); + this.itemSearchCommandWindow = new ItemSearchWindow(this.Data, new UiBuilder(this.InterfaceManager, "ItemSearcher"), false, arguments); this.itemSearchCommandWindow.OnItemChosen += (sender, item) => { var hexData = new byte[] { 0x02, 0x13, 0x06, 0xFE, 0xFF, 0xF3, 0xF3, 0xF3, 0x03, 0x02, 0x27, 0x07, 0x03, 0xF2, 0x3A, 0x2F, diff --git a/Dalamud/Interface/ItemSearchWindow.cs b/Dalamud/Interface/ItemSearchWindow.cs index ba7512088..fd16f7f06 100644 --- a/Dalamud/Interface/ItemSearchWindow.cs +++ b/Dalamud/Interface/ItemSearchWindow.cs @@ -41,11 +41,11 @@ namespace Dalamud.Interface public event EventHandler OnItemChosen; - public ItemSearchWindow(DataManager data, UiBuilder builder, bool closeOnChoose = true) { + public ItemSearchWindow(DataManager data, UiBuilder builder, bool closeOnChoose = true, string searchText = "") { this.data = data; this.builder = builder; this.closeOnChoose = closeOnChoose; - + this.searchText = searchText; while (!data.IsDataReady) Thread.Sleep(1); From 6187e3b4d6b61ec130408c4c8c2ebecff5b754fa Mon Sep 17 00:00:00 2001 From: Cara Date: Sun, 3 May 2020 23:57:00 +0930 Subject: [PATCH 2/2] Update ItemSearchWindow.cs --- Dalamud/Interface/ItemSearchWindow.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Dalamud/Interface/ItemSearchWindow.cs b/Dalamud/Interface/ItemSearchWindow.cs index fd16f7f06..8926a311b 100644 --- a/Dalamud/Interface/ItemSearchWindow.cs +++ b/Dalamud/Interface/ItemSearchWindow.cs @@ -46,6 +46,7 @@ namespace Dalamud.Interface this.builder = builder; this.closeOnChoose = closeOnChoose; this.searchText = searchText; + while (!data.IsDataReady) Thread.Sleep(1);