Skip to content

Commit 4cc5547

Browse files
simplified the fix
1 parent 5ecdfb7 commit 4cc5547

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -947,16 +947,13 @@ void UpdateBarTextColor()
947947
? UINavigationBar.Appearance.TintColor
948948
: iconColor.ToPlatform();
949949

950-
if (OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26))
950+
if ((OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26)) && NavigationBar.TintColor is not null)
951951
{
952952
if (VisibleViewController?.NavigationItem?.RightBarButtonItems is UIBarButtonItem[] items)
953953
{
954954
foreach (var item in items)
955955
{
956-
if (NavigationBar.TintColor is not null)
957-
{
958-
item.TintColor = NavigationBar.TintColor;
959-
}
956+
item.TintColor = NavigationBar.TintColor;
960957
}
961958
}
962959
}
@@ -1953,9 +1950,9 @@ void UpdateToolbarItems()
19531950
NavigationItem.SetRightBarButtonItems(primaries is null ? [] : primaries.ToArray(), false);
19541951
if ((OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26)) && primaries is not null && _navigation.TryGetTarget(out NavigationRenderer navigationRenderer))
19551952
{
1956-
foreach (var item in primaries)
1953+
if (navigationRenderer.NavigationBar?.TintColor is not null)
19571954
{
1958-
if (navigationRenderer.NavigationBar?.TintColor is not null)
1955+
foreach (var item in primaries)
19591956
{
19601957
item.TintColor = navigationRenderer.NavigationBar?.TintColor;
19611958
}

0 commit comments

Comments
 (0)