refactor(ui): retire ChatLogWindow and the v1.5.6 chat-window layer
The legacy ChatLogWindow.cs and its tightly coupled neighbours are gone: PayloadHandler, Popout, ChatInputBar, AutoCompleteInfo, AutoTellTabTint, the three tab-icon helpers, the old Ui/StatusBar and Ui/SymbolPicker behind the components-layer replacements, HellionStyle + helpers, the CompactInputSubmitter test mirror and the QuickPickerSelfTestStep. The new component layer (MainWindow + the five components + GlobalStyleScope) now drives the whole chat surface. InputPreview, CommandHelpWindow and Debugger lose their ChatLogWindow backref. The first two are skeleton windows for now — DrawConditions always returns false until the new chat layer exposes equivalent state. Debugger keeps the current-tab and vanilla-chat blocks; the payload counters are explicitly marked offline. DbViewer renders Sender/Content columns as plain TextValue strings instead of the removed DrawChunks. GameFunctions.Chat and GameFunctions.KeybindManager keep the hook plumbing intact but mark every ChatLogWindow.Activated / ChangeTabDelta / TellSpecial site as offline so the FFXIV-side integration still compiles and runs without an Activated entry point. TypingIpc.BuildState reports the IPC state as not-typing / not-focused until the new chat layer surfaces real focus and buffer state again. Plugin.cs Draw uses StyleEngine.GlobalStyleScope.Push for the per-frame theme push and stops calling BeginFrame / FinalizeFrame / HideStateCheck / DefaultText through the dead window. ImGuiUtil drops PostPayload + WrapText + the surrounding word-wrap pipeline. PluginHostFactory and PluginLifecycle drop the legacy DI singletons and AddWindow entries. Build is clean and csharpier is clean across the trimmed 131-file tree.
This commit is contained in:
+1
-19
@@ -97,7 +97,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
|
||||
// consistent across all properties for clarity.
|
||||
internal Ui.Windows.MainWindow MainWindow { get; private set; } = null!;
|
||||
public SettingsWindow SettingsWindow { get; private set; } = null!;
|
||||
public ChatLogWindow ChatLogWindow { get; private set; } = null!;
|
||||
public DbViewer DbViewer { get; private set; } = null!;
|
||||
public InputPreview InputPreview { get; private set; } = null!;
|
||||
public CommandHelpWindow CommandHelpWindow { get; private set; } = null!;
|
||||
@@ -114,7 +113,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
|
||||
internal TypingIpc TypingIpc { get; private set; } = null!;
|
||||
internal FontManager FontManager { get; private set; } = null!;
|
||||
internal Themes.ThemeRegistry ThemeRegistry { get; private set; } = null!;
|
||||
internal Ui.StatusBar StatusBar { get; private set; } = null!;
|
||||
internal Integrations.HonorificService HonorificService { get; private set; } = null!;
|
||||
internal Integrations.CustomAudioPlayer CustomAudioPlayer { get; private set; } = null!;
|
||||
|
||||
@@ -291,12 +289,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
|
||||
ExtraChat = _host.Services.GetRequiredService<ExtraChat>();
|
||||
HonorificService = _host.Services.GetRequiredService<Integrations.HonorificService>();
|
||||
CustomAudioPlayer = _host.Services.GetRequiredService<Integrations.CustomAudioPlayer>();
|
||||
StatusBar = _host.Services.GetRequiredService<Ui.StatusBar>();
|
||||
MessageManager = _host.Services.GetRequiredService<MessageManager>();
|
||||
AutoTellTabsService = _host.Services.GetRequiredService<AutoTellTabsService>();
|
||||
|
||||
MainWindow = _host.Services.GetRequiredService<Ui.Windows.MainWindow>();
|
||||
ChatLogWindow = _host.Services.GetRequiredService<ChatLogWindow>();
|
||||
SettingsWindow = _host.Services.GetRequiredService<SettingsWindow>();
|
||||
DbViewer = _host.Services.GetRequiredService<DbViewer>();
|
||||
InputPreview = _host.Services.GetRequiredService<InputPreview>();
|
||||
@@ -342,7 +338,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
|
||||
new SelfTests.FontManagerCtorSmokeStep(this),
|
||||
new SelfTests.FontPushSmokeStep(this),
|
||||
new SelfTests.WizardStateSmokeStep(this),
|
||||
new SelfTests.QuickPickerSelfTestStep(this),
|
||||
new SelfTests.FoxBannerTextureSmokeStep(this),
|
||||
]);
|
||||
|
||||
@@ -946,18 +941,14 @@ public sealed class Plugin : IAsyncDalamudPlugin
|
||||
// free on built-in themes and ~1 stat/second on custom themes.
|
||||
ThemeRegistry.RefreshActiveIfStale();
|
||||
|
||||
// Theme engine is always active; Classic is a theme, not a disabled state.
|
||||
using IDisposable _style = HellionStyle.PushGlobal(
|
||||
using IDisposable _style = Ui.StyleEngine.GlobalStyleScope.Push(
|
||||
ThemeRegistry.Active,
|
||||
ThemeRegistry,
|
||||
Config.WindowOpacity
|
||||
);
|
||||
|
||||
ChatLogWindow.BeginFrame();
|
||||
|
||||
if (Config.HideInLoadingScreens && Condition[ConditionFlag.BetweenAreas])
|
||||
{
|
||||
ChatLogWindow.FinalizeFrame();
|
||||
TypingIpc.Update();
|
||||
return;
|
||||
}
|
||||
@@ -970,28 +961,19 @@ public sealed class Plugin : IAsyncDalamudPlugin
|
||||
)
|
||||
)
|
||||
{
|
||||
ChatLogWindow.FinalizeFrame();
|
||||
TypingIpc.Update();
|
||||
return;
|
||||
}
|
||||
|
||||
ChatLogWindow.HideStateCheck();
|
||||
|
||||
Interface.UiBuilder.DisableUserUiHide = !Config.HideWhenUiHidden;
|
||||
ChatLogWindow.DefaultText = ImGui.GetStyle().Colors[(int)ImGuiCol.Text];
|
||||
|
||||
// RegularFont is nullable only because the live rebuild path
|
||||
// disposes it before reassigning; both ends of that swap happen on
|
||||
// this same draw thread, so it cannot be null here.
|
||||
// v1.5.3 fix: also push RegularFont when the bundled Inter Light is
|
||||
// selected. Without this, UseHellionFont=true silently fell back to
|
||||
// the FFXIV Axis font because the Appearance tab forces FontsEnabled
|
||||
// off in that branch, and the bundled font never made it into draw.
|
||||
var useRegularFont = Config.FontsEnabled || Config.UseHellionFont;
|
||||
using ((useRegularFont ? FontManager.RegularFont! : FontManager.Axis).Push())
|
||||
WindowSystem.Draw();
|
||||
|
||||
ChatLogWindow.FinalizeFrame();
|
||||
TypingIpc.Update();
|
||||
|
||||
FileDialogManager.Draw();
|
||||
|
||||
Reference in New Issue
Block a user