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

Resolved issue w/ invalid style

Browse Source
This commit is contained in:
Spider
2024-04-12 08:04:34 -05:00
parent f52bc2a41b
commit cc9e7aba61
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
+18 -4
View File
@@ -101,19 +101,33 @@ public sealed class ChatLogWindow : Window, IUiComponent {
public override void PreDraw() public override void PreDraw()
{ {
if (Plugin.Config.OverrideStyle) if (Plugin.Config.OverrideStyle && Plugin.Config.ChosenStyle != "")
{ {
var styles = StyleModel.GetConfiguredStyles(); var styles = StyleModel.GetConfiguredStyles();
styles?.First(style => style.Name.Equals(Plugin.Config.ChosenStyle)).Push(); 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() public override void PostDraw()
{ {
if (Plugin.Config.OverrideStyle) if (Plugin.Config.OverrideStyle && Plugin.Config.ChosenStyle != "")
{ {
var styles = StyleModel.GetConfiguredStyles(); var styles = StyleModel.GetConfiguredStyles();
styles?.First(style => style.Name.Equals(Plugin.Config.ChosenStyle)).Pop(); 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
}
} }
} }
ChatTwo/Ui/Popout.cs
+18 -4
View File
@@ -25,10 +25,17 @@ internal class Popout : Window
public override void PreDraw() public override void PreDraw()
{ {
if (ChatLogWindow.Plugin.Config.OverrideStyle) if (ChatLogWindow.Plugin.Config.OverrideStyle && ChatLogWindow.Plugin.Config.ChosenStyle != "")
{ {
var styles = StyleModel.GetConfiguredStyles(); var styles = StyleModel.GetConfiguredStyles();
styles?.First(style => style.Name.Equals(ChatLogWindow.Plugin.Config.ChosenStyle)).Push(); 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; Flags = ImGuiWindowFlags.None;
if (!ChatLogWindow.Plugin.Config.ShowPopOutTitleBar) if (!ChatLogWindow.Plugin.Config.ShowPopOutTitleBar)
@@ -59,10 +66,17 @@ internal class Popout : Window
{ {
ChatLogWindow.PopOutDocked[Idx] = ImGui.IsWindowDocked(); ChatLogWindow.PopOutDocked[Idx] = ImGui.IsWindowDocked();
if (ChatLogWindow.Plugin.Config.OverrideStyle) if (ChatLogWindow.Plugin.Config.OverrideStyle && ChatLogWindow.Plugin.Config.ChosenStyle != "")
{ {
var styles = StyleModel.GetConfiguredStyles(); var styles = StyleModel.GetConfiguredStyles();
styles?.First(style => style.Name.Equals(ChatLogWindow.Plugin.Config.ChosenStyle)).Pop(); 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
}
} }
} }