Skip to content

CmdPal: make dialogs prevent compact mode from being collapsed #49451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zadjii-msft wants to merge 1 commit into
base: main
Choose a base branch
from
+64 −4
Open

CmdPal: make dialogs prevent compact mode from being collapsed #49451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public sealed partial class MainWindow : WindowEx,
IRecipient<ToggleDevRibbonMessage>,
IRecipient<GetHwndMessage>,
IRecipient<ExpandCompactModeMessage>,
IRecipient<MaximizeForDialogMessage>,
IDisposable,
IHostWindow
{
Expand Down Expand Up @@ -112,6 +113,15 @@ public sealed partial class MainWindow : WindowEx,
private bool _preventHideWhenDeactivated;
private bool _isLoadedFromDock;

// While a modal dialog (e.g. a confirmation) is showing, the card is forced to fill the
// whole window so the dialog — which renders in the window's popup layer and is clipped to
// the card's HWND region — isn't cut off. Cleared when the dialog closes.
private bool _dialogFullExpandActive;

// The most recent expand/collapse request, remembered so the correct compact layout can be
// restored once a dialog-driven full expansion ends.
private bool _lastExpandRequested;

private DevRibbon? _devRibbon;

private MainWindowViewModel ViewModel { get; }
Expand Down Expand Up @@ -184,6 +194,7 @@ public MainWindow()
WeakReferenceMessenger.Default.Register<ToggleDevRibbonMessage>(this);
WeakReferenceMessenger.Default.Register<GetHwndMessage>(this);
WeakReferenceMessenger.Default.Register<ExpandCompactModeMessage>(this);
WeakReferenceMessenger.Default.Register<MaximizeForDialogMessage>(this);

// Hide our titlebar.
// We need to both ExtendsContentIntoTitleBar, then set the height to Collapsed
Expand Down Expand Up @@ -1901,16 +1912,32 @@ public void Receive(ExpandCompactModeMessage message)
this.DispatcherQueue.TryEnqueue(() => HandleExpandCompactOnUiThread(message.Expanded));
}

public void Receive(MaximizeForDialogMessage message)
{
this.DispatcherQueue.TryEnqueue(() =>
{
_dialogFullExpandActive = message.Maximize;

// Re-run with the last requested state: when maximizing this fills the window; when
// the dialog closes it restores the normal compact/expanded layout.
HandleExpandCompactOnUiThread(_lastExpandRequested);
});
Comment on lines +1915 to +1924
}

// The HWND is already as large as it will ever need to be (and it's transparent), so
// instead of resizing the window we simply shrink or grow the visible card inside it.
private void HandleExpandCompactOnUiThread(bool expanded)
{
_lastExpandRequested = expanded;

var settings = App.Current.Services.GetRequiredService<ISettingsService>().Settings;

if (!settings.CompactMode)
var preventCompactMode = _dialogFullExpandActive || !settings.CompactMode;
if (preventCompactMode)
{
// When compact mode is off the card is always static and fills the entire window,
// regardless of how much content is currently displayed.
// When compact mode is off, or a dialog is active, the card is
// always static and fills the entire window, regardless of how much
// content is currently displayed.
RootElement.SetCardStretch(true);
RootElement.SetCardMaxHeight(double.PositiveInfinity);
}
Expand Down
14 changes: 14 additions & 0 deletions src/modules/cmdpal/Microsoft.CmdPal.UI/Messages/MaximizeForDialogMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

namespace Microsoft.CmdPal.UI.Messages;

/// <summary>
/// Asks the host window to temporarily make the visible card fill the entire window,
/// ignoring the compact-mode clamps, so a modal dialog (e.g. a confirmation) isn't clipped
/// by the card's HWND region. Sent with <see cref="Maximize"/> = <see langword="true"/> while
/// the dialog is showing and <see langword="false"/> once it closes to restore the normal
/// compact/expanded behavior.
/// </summary>
public record MaximizeForDialogMessage(bool Maximize);

@michaeljolley michaeljolley Jul 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this just be MaximizeWindowMessage or ForceMaximizeMessage? My thinking is that we may find other places we need to maximize for outside dialogs.

21 changes: 20 additions & 1 deletion src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,26 @@ private async Task HandleConfirmArgsOnUiThread(IConfirmationArgs? args)
// };
}

var result = await dialog.ShowAsync();
// In compact mode the palette may be collapsed to just the search box. The confirmation
// dialog renders in the host window's popup layer, which is clipped to the card's HWND
// region, so merely expanding our own content isn't enough - the card must fill the whole
// window or the dialog is clipped. Ask the host window to maximize the card while the
// dialog is up (and expand our own content to match), then restore the normal compact
// behavior once it closes.
WeakReferenceMessenger.Default.Send(new MaximizeForDialogMessage(true));
HandleExpandCompactOnUiThread(true);

ContentDialogResult result;
try
{
result = await dialog.ShowAsync();
}
finally
{
WeakReferenceMessenger.Default.Send(new MaximizeForDialogMessage(false));
UpdateCompactModeForCurrentPage();
}

if (result == ContentDialogResult.Primary)
{
var performMessage = new PerformCommandMessage(vm);
Expand Down