openclaw/openclaw-windows-node
openclaw/openclaw-windows-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

fix(quicksend): preserve focus workaround with custom titlebar

Browse Source 
Keep the titlebar update while removing close-on-deactivation and restoring the Windows 10 hotkey foreground retry/topmost promotion path.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Scott Hanselman 2026-05-07 14:02:53 -04:00
parent 55bc5bed90
commit 371e338083
1 changed files with 68 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/OpenClaw.Tray.WinUI/Dialogs/QuickSendDialog.cs
View File

@ -24,6 +24,8 @@ public sealed class QuickSendDialog : WindowEx
private readonly TextBox _errorDetailsTextBox;
private readonly Button _sendButton;
private bool _isSending;
private bool _isClosed;
private bool _focusRetryRunning;
private const string TitleIcon = "🦞";
private const double WindowControlsReservedWidth = 140;
@ -33,8 +35,22 @@ public sealed class QuickSendDialog : WindowEx
[DllImport("user32.dll")]
private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
[DllImport("user32.dll")]
private static extern bool SetWindowPos(
IntPtr hWnd,
IntPtr hWndInsertAfter,
int X,
int Y,
int cx,
int cy,
uint uFlags);
private static readonly IntPtr HWND_TOPMOST = new(-1);
private const int TitleBarHeight = 48;
private const int SW_SHOWNORMAL = 1;
private const uint SWP_NOMOVE = 0x0002;
private const uint SWP_NOSIZE = 0x0001;
private const uint SWP_SHOWWINDOW = 0x0040;
public QuickSendDialog(OpenClawGatewayClient client, string? prefillMessage = null)
{
@ -51,6 +67,10 @@ public sealed class QuickSendDialog : WindowEx
// This avoids focus/activation oddities on Windows 10 for hotkey-launched windows.
BackdropHelper.TrySetAcrylicBackdrop((Microsoft.UI.Xaml.Window)this);
// Hotkey-launched windows can fail to foreground on Windows 10 due to
// foreground activation restrictions. Keep the existing topmost promotion.
this.IsAlwaysOnTop = true;
// Build UI programmatically (simple dialog)
var root = new Grid
{
@ -152,10 +172,21 @@ public sealed class QuickSendDialog : WindowEx
Content = outerGrid;
SetTitleBar(titleBar);
// Focus the text box when shown
Activated += OnActivated;
// Focus the text box when shown without closing on transient deactivation.
Activated += (s, e) =>
{
if (e.WindowActivationState != WindowActivationState.Deactivated)
{
TryBringToFront();
RequestInputFocus();
}
};
Closed += (s, e) => Logger.Info("[QuickSend] Dialog closed");
Closed += (s, e) =>
{
_isClosed = true;
Logger.Info("[QuickSend] Dialog closed");
};
Logger.Info($"[QuickSend] Dialog opened (prefill={!string.IsNullOrEmpty(prefillMessage)})");
}
@ -164,11 +195,15 @@ public sealed class QuickSendDialog : WindowEx
{
try
{
if (_isClosed)
return;
var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
if (hwnd == IntPtr.Zero) return;
// Make sure it's shown and activated.
// Make sure it's actually shown and promoted.
ShowWindow(hwnd, SW_SHOWNORMAL);
SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
SetForegroundWindow(hwnd);
}
catch (Exception ex)
@ -177,22 +212,6 @@ public sealed class QuickSendDialog : WindowEx
}
}
private void OnActivated(object sender, WindowActivatedEventArgs args)
{
if (args.WindowActivationState == WindowActivationState.Deactivated)
{
if (_isSending)
{
return;
}
Close();
return;
}
RequestInputFocus();
}
private async void OnKeyDown(object sender, KeyRoutedEventArgs e)
{
if (e.Key == global::Windows.System.VirtualKey.Enter && !_isSending)
@ -338,12 +357,41 @@ public sealed class QuickSendDialog : WindowEx
private void QueueFocusMessageInput()
{
if (_isClosed)
return;
DispatcherQueue?.TryEnqueue(FocusMessageInput);
}
private void RequestInputFocus()
{
QueueFocusMessageInput();
if (!_focusRetryRunning)
{
_focusRetryRunning = true;
_ = RetryFocusMessageInputAsync();
}
}
private async Task RetryFocusMessageInputAsync()
{
try
{
var delaysMs = new[] { 60, 160, 320 };
foreach (var delay in delaysMs)
{
await Task.Delay(delay);
if (_isClosed)
return;
TryBringToFront();
QueueFocusMessageInput();
}
}
finally
{
_focusRetryRunning = false;
}
}
private async Task<bool> EnsureGatewayConnectedAsync(int timeoutMs = 3000)