r-zakarya
04f52851fc
Adopts the approach that actually works: ApplicationHWND (FMX.Platform.Win) IS the taskbar proxy, so there is nothing to hunt for and it is valid before the form exists. And hiding it was never enough — the taskbar had already drawn the button; clearing WS_EX_APPWINDOW and setting WS_EX_TOOLWINDOW is what removes it, since a tool window is never listed. That style is permanent, which is why the button never came back after a restore. TrayProxyShowInTaskbar puts it back, called from RestoreWindowFromTray — the single choke point every tray restore already goes through — so it lands before RestoreFromTray shows the windows and the style takes effect on that show. Removes the scaffolding this chase accumulated and that the real fix makes pointless: the EVENT_OBJECT_SHOW hook, the polling worker, FindOurFMXAppWindow, TrayHideNow with its four probes, the one-shot OnActivate hide, and the [tray] tracing. ~4.8 KB of dead code. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
57 lines
2.3 KiB
ObjectPascal
57 lines
2.3 KiB
ObjectPascal
program PMServer;
|
|
|
|
uses
|
|
System.SysUtils, // FindCmdLineSwitch
|
|
System.StartUpCopy,
|
|
FMX.Forms,
|
|
PM.SingleInstance in 'Source\PM.SingleInstance.pas',
|
|
UMainForm in 'UMainForm.pas' {MainForm},
|
|
PM.JSON in 'Source\PM.JSON.pas',
|
|
PM.Database in 'Source\PM.Database.pas',
|
|
PM.Router in 'Source\PM.Router.pas',
|
|
PM.StaticFiles in 'Source\PM.StaticFiles.pas',
|
|
PM.EmbeddedAssets in 'Source\PM.EmbeddedAssets.pas',
|
|
PM.Crypto in 'Source\PM.Crypto.pas',
|
|
PM.RateLimit in 'Source\PM.RateLimit.pas',
|
|
PM.Audit in 'Source\PM.Audit.pas',
|
|
PM.Session in 'Source\PM.Session.pas',
|
|
PM.HTTPServer in 'Source\PM.HTTPServer.pas',
|
|
PM.Bridge in 'Source\PM.Bridge.pas',
|
|
PM.QuickUnlock in 'Source\PM.QuickUnlock.pas',
|
|
PM.PinUnlock in 'Source\PM.PinUnlock.pas',
|
|
PM.UserPrefs in 'Source\PM.UserPrefs.pas',
|
|
PM.AutoStart in 'Source\PM.AutoStart.pas',
|
|
PM.Favicon in 'Source\PM.Favicon.pas',
|
|
PM.ProcessLockdown in 'Source\PM.ProcessLockdown.pas',
|
|
PM.Handler.Ping in 'Handlers\PM.Handler.Ping.pas',
|
|
PM.Handler.Auth in 'Handlers\PM.Handler.Auth.pas',
|
|
PM.Handler.Folders in 'Handlers\PM.Handler.Folders.pas',
|
|
PM.Handler.Entries in 'Handlers\PM.Handler.Entries.pas',
|
|
PM.Handler.Passkey in 'Handlers\PM.Handler.Passkey.pas',
|
|
PM.Handler.Recovery in 'Handlers\PM.Handler.Recovery.pas',
|
|
PM.Handler.Audit in 'Handlers\PM.Handler.Audit.pas',
|
|
PM.Handler.Settings in 'Handlers\PM.Handler.Settings.pas',
|
|
PM.Handler.Attachments in 'Handlers\PM.Handler.Attachments.pas';
|
|
|
|
{$R *.res}
|
|
{$R assets\assets.res}
|
|
|
|
begin
|
|
// Single-instance: if another PMServer is running, bring it to front
|
|
// (it'll handle WM_PMSHOW on its message-only window) and exit. Avoids
|
|
// two icons in the tray and two HTTP servers fighting for the port.
|
|
if not PM.SingleInstance.AcquireOrSignal then
|
|
Exit;
|
|
|
|
Application.Initialize;
|
|
// --tray ("Start with Windows"): FMX puts its taskbar proxy on screen before
|
|
// FormCreate is ever reached — measured — so the watcher has to start here,
|
|
// before the form is built. It only touches raw Win32 (FindWindowEx +
|
|
// ShowWindow), never an FMX object: an earlier attempt that poked
|
|
// MainForm.Visible/Handle at this point died with an access violation.
|
|
if FindCmdLineSwitch('tray', True) then
|
|
StartTrayProxyHider;
|
|
Application.CreateForm(TMainForm, MainForm);
|
|
Application.Run;
|
|
end.
|