Skip to content

Commit

Permalink
chore: scope fix to only android
Browse files Browse the repository at this point in the history
  • Loading branch information
ajpinedam committed Nov 12, 2024
1 parent e01bf67 commit a5efb78
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -703,9 +703,9 @@

<!-- Uno workaround: On Android, the Height of ContentPresenters inside this Grid is not bing calculated correctly -->
<!-- It can be removed once this PR is merged: https://github.com/unoplatform/uno/pull/18261 -->
<Grid.RowDefinitions>
<android:Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
</android:Grid.RowDefinitions>

<Viewbox x:Name="IconBox"
MaxWidth="{ThemeResource TabViewItemHeaderIconSize}"
Expand Down
7 changes: 4 additions & 3 deletions src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -22960,10 +22960,11 @@
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<!-- Uno workaround: On Android, the ContentPresenters inside this are not calculating correctly -->
<Grid.RowDefinitions>
<!-- Uno workaround: On Android, the Height of ContentPresenters inside this Grid is not bing calculated correctly -->
<!-- It can be removed once this PR is merged: https://github.com/unoplatform/uno/pull/18261 -->
<android:Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
</android:Grid.RowDefinitions>
<Viewbox x:Name="IconBox" MaxWidth="{ThemeResource TabViewItemHeaderIconSize}" MaxHeight="{ThemeResource TabViewItemHeaderIconSize}" Margin="{ThemeResource TabViewItemHeaderIconMargin}">
<ContentControl x:Name="IconControl" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TabViewTemplateSettings.IconElement}" IsTabStop="False" Foreground="{ThemeResource TabViewItemIconForeground}" HighContrastAdjustment="None" />
</Viewbox>
Expand Down

0 comments on commit a5efb78

Please sign in to comment.