JonKazama-Hellion/HellionChat
1
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 28 Activity

Merge pull request #17

Browse Source 
Fix: Resolved issue w/ invalid style
This commit is contained in:
Infi
2024-04-12 19:46:04 +02:00
committed by GitHub
parent f52bc2a41b cc9e7aba61
commit 4751e3c8f7
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChatTwo/Ui/ChatLogWindow.cs
+16 -2
View File
@@ -101,20 +101,34 @@ public sealed class ChatLogWindow : Window, IUiComponent {
public override void PreDraw()
{
if (Plugin.Config.OverrideStyle)
if (Plugin.Config.OverrideStyle && Plugin.Config.ChosenStyle != "")
{
var styles = StyleModel.GetConfiguredStyles();
try
{
styles?.First(style => style.Name.Equals(Plugin.Config.ChosenStyle)).Push();
}
catch (InvalidOperationException e)
{
// Swallow the error - User does not have a valid style set
}
}
}
public override void PostDraw()
{
if (Plugin.Config.OverrideStyle)
if (Plugin.Config.OverrideStyle && Plugin.Config.ChosenStyle != "")
{
var styles = StyleModel.GetConfiguredStyles();
try
{
styles?.First(style => style.Name.Equals(Plugin.Config.ChosenStyle)).Pop();
}
catch (InvalidOperationException e)
{
// Swallow the error - User does not have a valid style set
}
}
}
public void Dispose() {
ChatTwo/Ui/Popout.cs
+16 -2
View File
@@ -25,11 +25,18 @@ internal class Popout : Window
public override void PreDraw()
{
if (ChatLogWindow.Plugin.Config.OverrideStyle)
if (ChatLogWindow.Plugin.Config.OverrideStyle && ChatLogWindow.Plugin.Config.ChosenStyle != "")
{
var styles = StyleModel.GetConfiguredStyles();
try
{
styles?.First(style => style.Name.Equals(ChatLogWindow.Plugin.Config.ChosenStyle)).Push();
}
catch (InvalidOperationException e)
{
// Swallow the error - User does not have a valid style set
}
}
Flags = ImGuiWindowFlags.None;
if (!ChatLogWindow.Plugin.Config.ShowPopOutTitleBar)
Flags |= ImGuiWindowFlags.NoTitleBar;
@@ -59,11 +66,18 @@ internal class Popout : Window
{
ChatLogWindow.PopOutDocked[Idx] = ImGui.IsWindowDocked();
if (ChatLogWindow.Plugin.Config.OverrideStyle)
if (ChatLogWindow.Plugin.Config.OverrideStyle && ChatLogWindow.Plugin.Config.ChosenStyle != "")
{
var styles = StyleModel.GetConfiguredStyles();
try
{
styles?.First(style => style.Name.Equals(ChatLogWindow.Plugin.Config.ChosenStyle)).Pop();
}
catch (InvalidOperationException e)
{
// Swallow the error - User does not have a valid style set
}
}
}
public override void OnClose()