Merge branch '2.0.0' into dotnet10-api14-migration

This commit is contained in:
defnotken
2025-11-26 16:20:38 -06:00
116 changed files with 20468 additions and 3311 deletions

View File

@@ -42,7 +42,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
private IDalamudTextureWrap? _pfpTextureWrap;
private string _profileDescription = string.Empty;
private byte[] _profileImage = [];
private bool _showFileDialogError = false;
private bool _showFileDialogError = false;
private int _multiInvites;
private string _newPassword;
private bool _pwChangeSuccess;
@@ -103,7 +103,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
var perm = GroupFullInfo.GroupPermissions;
using var tabbar = ImRaii.TabBar("syncshell_tab_" + GroupFullInfo.GID);
if (tabbar)
{
DrawInvites(perm);
@@ -111,7 +111,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
DrawManagement();
DrawPermission(perm);
DrawProfile();
}
}
@@ -229,9 +229,9 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
return;
}
if (!_profileImage.SequenceEqual(_profileData.ImageData.Value))
if (!_profileImage.SequenceEqual(_profileData.ProfileImageData.Value))
{
_profileImage = _profileData.ImageData.Value;
_profileImage = _profileData.ProfileImageData.Value;
_pfpTextureWrap?.Dispose();
_pfpTextureWrap = _uiSharedService.LoadImage(_profileImage);
}
@@ -335,7 +335,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
.Cast<int>()
.ToList();
foreach(int tag in allCategoryIndexes)
foreach (int tag in allCategoryIndexes)
{
using (ImRaii.PushId($"tag-{tag}")) DrawTag(tag);
}