Skip to content

Commit

Permalink
Merge pull request #914 from unoplatform/dev/nr/wrapingrid
Browse files Browse the repository at this point in the history
chore: Insert grid at root
  • Loading branch information
nickrandolph committed Aug 20, 2024
2 parents ff51808 + 33d0767 commit 6c44254
Showing 1 changed file with 20 additions and 18 deletions.
38 changes: 20 additions & 18 deletions src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,32 @@
<!--#endif-->
Background="{ThemeResource $themeBackgroundBrush$}">
<ScrollViewer>
<StackPanel$toolkitSafeArea$
HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock AutomationProperties.AutomationId="HelloTextBlock"
Text="Hello Uno Platform!"
HorizontalAlignment="Center" />
<Grid$toolkitSafeArea$>
<StackPanel
HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock AutomationProperties.AutomationId="HelloTextBlock"
Text="Hello Uno Platform!"
HorizontalAlignment="Center" />
<!--#if (mauiEmbedding)-->
<!--#if (useNonMauiPlatforms)-->
<maui:Grid>
<embed:MauiHost x:Name="MauiHostElement"
xmlns:embed="using:Uno.Extensions.Maui"
Source="controls:EmbeddedControl" />
</maui:Grid>
<not_maui:Grid>
<TextBlock AutomationProperties.AutomationId="NotMauiTextBlock"
<maui:Grid>
<embed:MauiHost x:Name="MauiHostElement"
xmlns:embed="using:Uno.Extensions.Maui"
Source="controls:EmbeddedControl" />
</maui:Grid>
<not_maui:Grid>
<TextBlock AutomationProperties.AutomationId="NotMauiTextBlock"
Text="Alternative content for Non-Maui targets"
HorizontalAlignment="Center" />
</not_maui:Grid>
</not_maui:Grid>
<!--#else-->
<embed:MauiHost x:Name="MauiHostElement"
xmlns:embed="using:Uno.Extensions.Maui"
Source="controls:EmbeddedControl" />
<embed:MauiHost x:Name="MauiHostElement"
xmlns:embed="using:Uno.Extensions.Maui"
Source="controls:EmbeddedControl" />
<!--#endif-->
<!--#endif-->
</StackPanel>
</StackPanel>
</Grid>
</ScrollViewer>
</Page>

0 comments on commit 6c44254

Please sign in to comment.