From 7bea2e88f1548aa137d32523eb0465bc184286fe Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Tue, 29 Oct 2024 16:26:45 +0100 Subject: [PATCH] FUCKING COMBO BOXES --- MareSynchronos/UI/UISharedService.cs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/MareSynchronos/UI/UISharedService.cs b/MareSynchronos/UI/UISharedService.cs index 89063b3..7e972e8 100644 --- a/MareSynchronos/UI/UISharedService.cs +++ b/MareSynchronos/UI/UISharedService.cs @@ -559,21 +559,11 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase if (!_selectedComboItems.TryGetValue(comboName, out var selectedItem) && selectedItem == null) { - if (!EqualityComparer.Default.Equals(initialSelectedItem, default(T))) - { - selectedItem = initialSelectedItem; - _selectedComboItems[comboName] = selectedItem!; - if (!EqualityComparer.Default.Equals(initialSelectedItem, default)) - onSelected?.Invoke(initialSelectedItem); - } - else - { - selectedItem = null; - _selectedComboItems[comboName] = selectedItem; - } + selectedItem = initialSelectedItem; + _selectedComboItems[comboName] = selectedItem; } - if (ImGui.BeginCombo(comboName, toName((T?)selectedItem))) + if (ImGui.BeginCombo(comboName, selectedItem == null ? "Unset Value" : toName((T?)selectedItem))) { foreach (var item in comboItems) { @@ -887,7 +877,6 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase { var aliasPairs = _discordOAuthUIDs?.Result?.Select(t => new UIDAliasPair(t.Key, t.Value)).ToList() ?? [new UIDAliasPair(item.UID ?? null, null)]; var uidComboName = "UID###" + item.CharacterName + item.WorldId + serverUri + indexOffset; - logger?.LogInformation("Drawing Combo with name {name}", uidComboName); DrawCombo(uidComboName, aliasPairs, (v) => {