Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Fix to display toolbar icons under UWP Shell (partial fix for #11706). #11838

Merged
merged 2 commits into from
Nov 3, 2020
Merged

Fix to display toolbar icons under UWP Shell (partial fix for #11706). #11838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f10edb8
Fix to display toolbar icons under UWP Shell (partial fix for #11706).
JogyBlack Aug 19, 2020
20a1005
- remove manual ui test
PureWeen Nov 2, 2020
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
6 changes: 3 additions & 3 deletions ...ssues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Issue11572.xaml.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue11571.xaml.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue11715.xaml.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue11875.xaml.cs" >
<Compile Include="$(MSBuildThisFileDirectory)Issue11875.xaml.cs">
<DependentUpon>Issue11875.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Issue11737.xaml.cs">
Expand All @@ -1607,7 +1607,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Issue11963.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue12126.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue11831.xaml.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue11938.xaml.cs">
<Compile Include="$(MSBuildThisFileDirectory)Issue11938.xaml.cs">
<DependentUpon>Issue11938.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Issue11496.xaml.cs">
Expand Down Expand Up @@ -2447,4 +2447,4 @@
<Generator>MSBuild:Compile</Generator>
</EmbeddedResource>
</ItemGroup>
</Project>
</Project>
12 changes: 6 additions & 6 deletions Xamarin.Forms.Platform.UAP/Shell/ShellStyles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
<xf:ShellToolbarItemRenderer ToolbarItem="{Binding}" Margin="0" Background="Transparent" BorderThickness="1"
IsEnabled="{Binding IsEnabled}" Command="{Binding Command}" CommandParameter="{Binding CommandParameter}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Image
Source="{Binding IconImageSource, Converter={StaticResource ImageConverter}}" VerticalAlignment="Center" />
<TextBlock Grid.Row="1" Foreground="White" VerticalAlignment="Center" Text="{Binding Text}"></TextBlock>
DataContext="{Binding IconImageSource, Converter={StaticResource ImageConverter}}" Source="{Binding Value}" VerticalAlignment="Center" />
<TextBlock Grid.Column="1" Foreground="White" VerticalAlignment="Center" Text="{Binding Text}"></TextBlock>
</Grid>
</xf:ShellToolbarItemRenderer>
</DataTemplate>
Expand Down