diff --git a/ChatTwo/ChatTwo.csproj b/ChatTwo/ChatTwo.csproj index ae77ef0..14f9529 100755 --- a/ChatTwo/ChatTwo.csproj +++ b/ChatTwo/ChatTwo.csproj @@ -1,6 +1,6 @@ - 1.29.18 + 1.29.19 net8.0-windows enable enable diff --git a/ChatTwo/Configuration.cs b/ChatTwo/Configuration.cs index ce33018..91ecc9e 100755 --- a/ChatTwo/Configuration.cs +++ b/ChatTwo/Configuration.cs @@ -463,8 +463,6 @@ internal class UsedChannel internal void SetChannel(InputChannel channel) { - UseTempChannel = false; - TempTellTarget = null; Channel = channel; } } diff --git a/ChatTwo/Resources/Language.fr.resx b/ChatTwo/Resources/Language.fr.resx index 64e2ce3..78484fd 100644 --- a/ChatTwo/Resources/Language.fr.resx +++ b/ChatTwo/Resources/Language.fr.resx @@ -188,10 +188,10 @@ Permettre le redimensionnement du chat - Allow moving window + Autoriser le déplacement de la fenêtre - Allow resizing window + Autoriser le redimensionnement de la fenêtre Afficher la barre de titre du chat @@ -1292,7 +1292,7 @@ Date - Channel + Canal Expéditeur diff --git a/ChatTwo/Resources/Language.zh-Hans.resx b/ChatTwo/Resources/Language.zh-Hans.resx index 19f17f4..bb3cb13 100644 --- a/ChatTwo/Resources/Language.zh-Hans.resx +++ b/ChatTwo/Resources/Language.zh-Hans.resx @@ -188,10 +188,10 @@ 允许调整聊天窗口大小 - Allow moving window + 允许移动窗口 - Allow resizing window + 允许调整窗口大小 显示聊天窗口标题栏 @@ -1292,7 +1292,7 @@ 日期 - Channel + 频道 发送人 diff --git a/ChatTwo/Ui/ChatLogWindow.cs b/ChatTwo/Ui/ChatLogWindow.cs index 7b450ee..8abf09f 100644 --- a/ChatTwo/Ui/ChatLogWindow.cs +++ b/ChatTwo/Ui/ChatLogWindow.cs @@ -9,7 +9,6 @@ using ChatTwo.GameFunctions.Types; using ChatTwo.Resources; using ChatTwo.Util; using Dalamud.Game.Addon.Lifecycle; -using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Interface; @@ -485,8 +484,9 @@ public sealed class ChatLogWindow : Window // the text input in a tab with input disabled. The usual way that // Activate gets disabled is via the text input callback, but that // doesn't get called if the input is disabled. - if (Plugin.CurrentTab.InputDisabled == true) + if (Plugin.CurrentTab.InputDisabled) Activate = false; + if (Plugin.Config is { OverrideStyle: true, ChosenStyle: not null }) StyleModel.GetConfiguredStyles()?.FirstOrDefault(style => style.Name == Plugin.Config.ChosenStyle)?.Pop(); }