From fc67e0f2f7e52e48b74e76fe15124d4dc4757b92 Mon Sep 17 00:00:00 2001 From: Dominik Titl <78549750+morning4coffe-dev@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:10:13 +0100 Subject: [PATCH] fix: Premature vertical arrangement of `InfoBar` Content --- src/Uno.UI/Microsoft/UI/Xaml/Controls/InfoBar/InfoBarPanel.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/InfoBar/InfoBarPanel.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/InfoBar/InfoBarPanel.cs index 65049544689d..95dc6156f10b 100644 --- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/InfoBar/InfoBarPanel.cs +++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/InfoBar/InfoBarPanel.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -// MUX reference InfoBarPanel.cpp, tag winui3/release/1.4.2 +// MUX reference InfoBarPanel.cpp, tag winui3/release/1.7-stable using System; using Windows.Foundation; @@ -48,7 +48,6 @@ protected override Size MeasureOverride(Size availableSize) { // Add up the width of all items if they were laid out horizontally var horizontalMargin = GetHorizontalOrientationMargin(child); - totalWidth += childDesiredSize.Width + (nItems > 0 ? (float)horizontalMargin.Left : 0) + (float)horizontalMargin.Right; // Ignore left margin of first and right margin of last child totalWidth += childDesiredSize.Width + (nItems > 0 ? (float)horizontalMargin.Left : 0) +