Merge remote-tracking branch 'origin/2.0.1' into animatedheader-fixes
# Conflicts: # LightlessSync/LightlessSync.csproj # LightlessSync/UI/Style/AnimatedHeader.cs # LightlessSync/UI/ZoneChatUi.cs
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<Authors></Authors>
|
||||
<Company></Company>
|
||||
<Version>2.0.0</Version>
|
||||
<Version>2.0.1</Version>
|
||||
<Description></Description>
|
||||
<Copyright></Copyright>
|
||||
<PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>
|
||||
|
||||
@@ -82,6 +82,7 @@ public sealed class ZoneChatUi : WindowMediatorSubscriberBase
|
||||
private string? _dragHoverKey;
|
||||
private bool _HideStateActive;
|
||||
private bool _HideStateWasOpen;
|
||||
private bool _pushedStyle;
|
||||
|
||||
public ZoneChatUi(
|
||||
ILogger<ZoneChatUi> logger,
|
||||
@@ -139,6 +140,8 @@ public sealed class ZoneChatUi : WindowMediatorSubscriberBase
|
||||
var config = _chatConfigService.Current;
|
||||
var baseOpacity = Math.Clamp(config.ChatWindowOpacity, MinWindowOpacity, MaxWindowOpacity);
|
||||
_baseWindowOpacity = baseOpacity;
|
||||
ImGui.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 0);
|
||||
_pushedStyle = true;
|
||||
|
||||
if (config.FadeWhenUnfocused)
|
||||
{
|
||||
@@ -823,6 +826,16 @@ public sealed class ZoneChatUi : WindowMediatorSubscriberBase
|
||||
ImGui.EndPopup();
|
||||
}
|
||||
|
||||
public override void PostDraw()
|
||||
{
|
||||
if (_pushedStyle)
|
||||
{
|
||||
ImGui.PopStyleVar(1);
|
||||
_pushedStyle = false;
|
||||
}
|
||||
base.PostDraw();
|
||||
}
|
||||
|
||||
private void OpenReportPopup(ChatChannelSnapshot channel, ChatMessageEntry message)
|
||||
{
|
||||
if (message.Payload is not { } payload)
|
||||
|
||||
Reference in New Issue
Block a user