2.0.0 (#92)
All checks were successful
Tag and Release Lightless / tag-and-release (push) Successful in 2m27s
All checks were successful
Tag and Release Lightless / tag-and-release (push) Successful in 2m27s
2.0.0 Changes: - Reworked shell finder UI with compact or list view with profile tags showing with the listing, allowing moderators to broadcast the syncshell as well to have it be used more. - Reworked user list in syncshell admin screen to have filter visible and moved away from table to its own thing, allowing to copy uid/note/alias when clicking on the name. - Reworked download bars and download box to make it look more modern, removed the jitter around, so it shouldn't vibrate around much. - Chat has been added to the top menu, working in Zone or in Syncshells to be used there. - Paired system has been revamped to make pausing and unpausing faster, and loading people should be faster as well. - Moved to the internal object table to have faster load times for users; people should load in faster - Compactor is running on a multi-threaded level instead of single-threaded; this should increase the speed of compacting files - Nameplate Service has been reworked so it wouldn't use the nameplate handler anymore. - Files can be resized when downloading to reduce load on users if they aren't compressed. (can be toggled to resize all). - Penumbra Collections are now only made when people are visible, reducing the load on boot-up when having many syncshells in your list. - Lightfinder plates have been moved away from using Nameplates, but will use an overlay. - Main UI has been changed a bit with a gradient, and on hover will glow up now. - Reworked Profile UI for Syncshell and Users to be more user-facing with more customizable items. - Reworked Settings UI to look more modern. - Performance should be better due to new systems that would dispose of the collections and better caching of items. Co-authored-by: defnotken <itsdefnotken@gmail.com> Co-authored-by: azyges <aaaaaa@aaa.aaa> Co-authored-by: choco <choco@patat.nl> Co-authored-by: cake <admin@cakeandbanana.nl> Co-authored-by: Minmoose <KennethBohr@outlook.com> Reviewed-on: #92
This commit was merged in pull request #92.
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
using Dalamud.Bindings.ImGui;
|
||||
using Dalamud.Interface;
|
||||
using Dalamud.Interface.Utility.Raii;
|
||||
using LightlessSync.PlayerData.Pairs;
|
||||
using LightlessSync.UI.Handlers;
|
||||
using LightlessSync.UI.Models;
|
||||
using System.Collections.Immutable;
|
||||
using LightlessSync.UI.Style;
|
||||
using OtterGui.Text;
|
||||
|
||||
namespace LightlessSync.UI.Components;
|
||||
|
||||
@@ -11,16 +13,18 @@ public abstract class DrawFolderBase : IDrawFolder
|
||||
{
|
||||
public IImmutableList<DrawUserPair> DrawPairs { get; init; }
|
||||
protected readonly string _id;
|
||||
protected readonly IImmutableList<Pair> _allPairs;
|
||||
protected readonly IImmutableList<PairUiEntry> _allPairs;
|
||||
protected readonly TagHandler _tagHandler;
|
||||
protected readonly UiSharedService _uiSharedService;
|
||||
private float _menuWidth = -1;
|
||||
public int OnlinePairs => DrawPairs.Count(u => u.Pair.IsOnline);
|
||||
public int OnlinePairs => DrawPairs.Count(u => u.DisplayEntry.Connection.IsOnline);
|
||||
public int TotalPairs => _allPairs.Count;
|
||||
private bool _wasHovered = false;
|
||||
private bool _suppressNextRowToggle;
|
||||
private bool _rowClickArmed;
|
||||
|
||||
protected DrawFolderBase(string id, IImmutableList<DrawUserPair> drawPairs,
|
||||
IImmutableList<Pair> allPairs, TagHandler tagHandler, UiSharedService uiSharedService)
|
||||
IImmutableList<PairUiEntry> allPairs, TagHandler tagHandler, UiSharedService uiSharedService)
|
||||
{
|
||||
_id = id;
|
||||
DrawPairs = drawPairs;
|
||||
@@ -31,11 +35,14 @@ public abstract class DrawFolderBase : IDrawFolder
|
||||
|
||||
protected abstract bool RenderIfEmpty { get; }
|
||||
protected abstract bool RenderMenu { get; }
|
||||
protected virtual bool EnableRowClick => true;
|
||||
|
||||
public void Draw()
|
||||
{
|
||||
if (!RenderIfEmpty && !DrawPairs.Any()) return;
|
||||
|
||||
_suppressNextRowToggle = false;
|
||||
|
||||
using var id = ImRaii.PushId("folder_" + _id);
|
||||
var color = ImRaii.PushColor(ImGuiCol.ChildBg, ImGui.GetColorU32(ImGuiCol.FrameBgHovered), _wasHovered);
|
||||
using (ImRaii.Child("folder__" + _id, new System.Numerics.Vector2(UiSharedService.GetWindowContentRegionWidth() - ImGui.GetCursorPosX(), ImGui.GetFrameHeight())))
|
||||
@@ -48,7 +55,8 @@ public abstract class DrawFolderBase : IDrawFolder
|
||||
_uiSharedService.IconText(icon);
|
||||
if (ImGui.IsItemClicked())
|
||||
{
|
||||
_tagHandler.SetTagOpen(_id, !_tagHandler.IsTagOpen(_id));
|
||||
ToggleFolderOpen();
|
||||
SuppressNextRowToggle();
|
||||
}
|
||||
|
||||
ImGui.SameLine();
|
||||
@@ -62,10 +70,41 @@ public abstract class DrawFolderBase : IDrawFolder
|
||||
DrawName(rightSideStart - leftSideEnd);
|
||||
}
|
||||
|
||||
_wasHovered = ImGui.IsItemHovered();
|
||||
var rowHovered = ImGui.IsItemHovered();
|
||||
_wasHovered = rowHovered;
|
||||
|
||||
if (EnableRowClick)
|
||||
{
|
||||
if (rowHovered && ImGui.IsMouseClicked(ImGuiMouseButton.Left) && !_suppressNextRowToggle)
|
||||
{
|
||||
_rowClickArmed = true;
|
||||
}
|
||||
|
||||
if (_rowClickArmed && rowHovered && ImGui.IsMouseReleased(ImGuiMouseButton.Left))
|
||||
{
|
||||
ToggleFolderOpen();
|
||||
_rowClickArmed = false;
|
||||
}
|
||||
|
||||
if (!ImGui.IsMouseDown(ImGuiMouseButton.Left))
|
||||
{
|
||||
_rowClickArmed = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
_rowClickArmed = false;
|
||||
}
|
||||
|
||||
if (_wasHovered)
|
||||
{
|
||||
Selune.RegisterHighlight(ImGui.GetItemRectMin(), ImGui.GetItemRectMax(), spanFullWidth: true);
|
||||
}
|
||||
|
||||
color.Dispose();
|
||||
|
||||
_suppressNextRowToggle = false;
|
||||
|
||||
ImGui.Separator();
|
||||
|
||||
// if opened draw content
|
||||
@@ -74,9 +113,13 @@ public abstract class DrawFolderBase : IDrawFolder
|
||||
using var indent = ImRaii.PushIndent(_uiSharedService.GetIconSize(FontAwesomeIcon.EllipsisV).X + ImGui.GetStyle().ItemSpacing.X, false);
|
||||
if (DrawPairs.Any())
|
||||
{
|
||||
foreach (var item in DrawPairs)
|
||||
using var clipper = ImUtf8.ListClipper(DrawPairs.Count, ImGui.GetFrameHeightWithSpacing());
|
||||
while (clipper.Step())
|
||||
{
|
||||
item.DrawPairedClient();
|
||||
for (var i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
|
||||
{
|
||||
DrawPairs[i].DrawPairedClient();
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -110,6 +153,7 @@ public abstract class DrawFolderBase : IDrawFolder
|
||||
ImGui.SameLine(windowEndX - barButtonSize.X);
|
||||
if (_uiSharedService.IconButton(FontAwesomeIcon.EllipsisV))
|
||||
{
|
||||
SuppressNextRowToggle();
|
||||
ImGui.OpenPopup("User Flyout Menu");
|
||||
}
|
||||
if (ImGui.BeginPopup("User Flyout Menu"))
|
||||
@@ -123,7 +167,16 @@ public abstract class DrawFolderBase : IDrawFolder
|
||||
_menuWidth = 0;
|
||||
}
|
||||
}
|
||||
|
||||
return DrawRightSide(rightSideStart);
|
||||
}
|
||||
|
||||
protected void SuppressNextRowToggle()
|
||||
{
|
||||
_suppressNextRowToggle = true;
|
||||
}
|
||||
|
||||
private void ToggleFolderOpen()
|
||||
{
|
||||
_tagHandler.SetTagOpen(_id, !_tagHandler.IsTagOpen(_id));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user