friendlynamazu/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

FUCKING COMBO BOXES

Browse Source
This commit is contained in:
Stanley Dimant
2024-10-29 16:26:45 +01:00
parent 1ef6f50246
commit 7bea2e88f1
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MareSynchronos/UI/UISharedService.cs
View File

@@ -558,22 +558,12 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
if (!comboItems.Any()) return default; if (!comboItems.Any()) return default;
if (!_selectedComboItems.TryGetValue(comboName, out var selectedItem) && selectedItem == null) if (!_selectedComboItems.TryGetValue(comboName, out var selectedItem) && selectedItem == null)
{
if (!EqualityComparer<T>.Default.Equals(initialSelectedItem, default(T)))
{ {
selectedItem = initialSelectedItem; selectedItem = initialSelectedItem;
_selectedComboItems[comboName] = selectedItem!;
if (!EqualityComparer<T>.Default.Equals(initialSelectedItem, default))
onSelected?.Invoke(initialSelectedItem);
}
else
{
selectedItem = null;
_selectedComboItems[comboName] = selectedItem; _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) 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 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; var uidComboName = "UID###" + item.CharacterName + item.WorldId + serverUri + indexOffset;
logger?.LogInformation("Drawing Combo with name {name}", uidComboName);
DrawCombo(uidComboName, aliasPairs, DrawCombo(uidComboName, aliasPairs,
(v) => (v) =>
{ {