Skip to content

Fix: Defer Omnibar padding calculation until UI elements are measured #17547

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Defer Omnibar padding calculation until UI elements are measured #17547

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
35 changes: 31 additions & 4 deletions src/Files.App.Controls/Omnibar/Omnibar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,38 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
var modeButtonWidth = newMode.ActualWidth;
var modeSeparatorWidth = itemCount is not 0 or 1 ? _modesHostGrid.Children[1] is FrameworkElement frameworkElement ? frameworkElement.ActualWidth : 0 : 0;

var leftPadding = (itemIndex + 1) * modeButtonWidth + modeSeparatorWidth * itemIndex;
var rightPadding = (itemCount - itemIndex - 1) * modeButtonWidth + modeSeparatorWidth * (itemCount - itemIndex - 1) + 8;
// Check if the UI elements have been properly measured
// If ActualWidth is 0, defer the padding calculation to avoid division by zero in WinUI's layout system
if (modeButtonWidth > 0)
{
var leftPadding = (itemIndex + 1) * modeButtonWidth + modeSeparatorWidth * itemIndex;
var rightPadding = (itemCount - itemIndex - 1) * modeButtonWidth + modeSeparatorWidth * (itemCount - itemIndex - 1) + 8;

// Set the correct AutoSuggestBox cursor position
AutoSuggestBoxPadding = new(leftPadding, 0, rightPadding, 0);
// Set the correct AutoSuggestBox cursor position
AutoSuggestBoxPadding = new(leftPadding, 0, rightPadding, 0);
}
else
{
// Defer padding calculation until the UI elements are properly measured
DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Low, () =>
{
// Force layout update to ensure ActualWidth values are available
_modesHostGrid.UpdateLayout();
newMode.UpdateLayout();

var updatedModeButtonWidth = newMode.ActualWidth;
var updatedModeSeparatorWidth = itemCount is not 0 or 1 ? _modesHostGrid.Children[1] is FrameworkElement frameworkElement ? frameworkElement.ActualWidth : 0 : 0;

// Only update padding if we now have valid measurements
if (updatedModeButtonWidth > 0)
{
var leftPadding = (itemIndex + 1) * updatedModeButtonWidth + updatedModeSeparatorWidth * itemIndex;
var rightPadding = (itemCount - itemIndex - 1) * updatedModeButtonWidth + updatedModeSeparatorWidth * (itemCount - itemIndex - 1) + 8;

AutoSuggestBoxPadding = new(leftPadding, 0, rightPadding, 0);
}
});
}

_textChangeReason = OmnibarTextChangeReason.ProgrammaticChange;
ChangeTextBoxText(newMode.Text ?? string.Empty);
Expand Down
Loading