Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,17 @@ void UpdateBarTextColor()
NavigationBar.TintColor = iconColor == null || NavPage.OnThisPlatform().GetStatusBarTextColorMode() == StatusBarTextColorMode.DoNotAdjust
? UINavigationBar.Appearance.TintColor
: iconColor.ToPlatform();

if ((OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26)) && NavigationBar.TintColor is not null)
{
if (VisibleViewController?.NavigationItem?.RightBarButtonItems is UIBarButtonItem[] items)
{
foreach (var item in items)
{
item.TintColor = NavigationBar.TintColor;
}
}
}
}

void SetStatusBarStyle()
Expand Down Expand Up @@ -1064,7 +1075,7 @@ internal static void SetFlyoutLeftBarButton(UIViewController containerController
// We only check height because the navigation bar constrains vertical space (44pt height),
// but allows horizontal flexibility. Width can vary based on icon design and content,
// while height must fit within the fixed navigation bar bounds to avoid clipping.

// if the image is bigger than the default available size, resize it
if (icon is not null)
{
Expand Down Expand Up @@ -1937,6 +1948,14 @@ void UpdateToolbarItems()
}

NavigationItem.SetRightBarButtonItems(primaries is null ? [] : primaries.ToArray(), false);
if ((OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26)) && primaries is not null && _navigation.TryGetTarget(out NavigationRenderer navigationRenderer)
&& navigationRenderer.NavigationBar?.TintColor is UIColor tintColor)
{
foreach (var item in primaries)
{
item.TintColor = tintColor;
}
}

if (_navigation.TryGetTarget(out NavigationRenderer n))
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading