forked from unoplatform/uno
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Update TwoPaneView to winui3/release/1.4.2
- Loading branch information
1 parent
69abdbf
commit f01ebe1
Showing
12 changed files
with
333 additions
and
416 deletions.
There are no files selected for viewing
200 changes: 72 additions & 128 deletions
200
src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/TwoPaneView.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,130 +1,74 @@ | ||
| <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. --> | ||
| <!-- MUX Reference TwoPaneView.xaml, commit a939567 --> | ||
| <ResourceDictionary | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:local="using:Microsoft.UI.Xaml.Controls" | ||
| xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" | ||
| xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"> | ||
|
|
||
| <Style x:Key="DefaultTwoPaneViewStyle" TargetType="local:TwoPaneView"> | ||
| <Setter Property="HorizontalAlignment" Value="Stretch" /> | ||
| <Setter Property="VerticalAlignment" Value="Stretch" /> | ||
| <Setter Property="MinWideModeWidth" Value="641"/> | ||
| <Setter Property="MinTallModeHeight" Value="641"/> | ||
| <Setter Property="IsTabStop" Value="False"/> | ||
| <Setter Property="Template"> | ||
| <Setter.Value> | ||
| <ControlTemplate TargetType="local:TwoPaneView"> | ||
| <Grid x:Name="RootGrid" Background="{TemplateBinding Background}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> | ||
| <VisualStateManager.VisualStateGroups> | ||
| <VisualStateGroup x:Name="ModeStates"> | ||
| <VisualState x:Name="ViewMode_LeftRight"/> | ||
|
|
||
| <VisualState x:Name="ViewMode_RightLeft"> | ||
| <VisualState.Setters> | ||
| <contract7NotPresent:Setter Target="PART_Pane1.(Grid.Column)" Value="2"/> | ||
| <contract7NotPresent:Setter Target="PART_Pane2.(Grid.Column)" Value="0"/> | ||
|
|
||
| <contract7Present:Setter Target="PART_Pane1ScrollViewer.(Grid.Column)" Value="2"/> | ||
| <contract7Present:Setter Target="PART_Pane2ScrollViewer.(Grid.Column)" Value="0"/> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
|
|
||
| <VisualState x:Name="ViewMode_TopBottom"> | ||
| <VisualState.Setters> | ||
| <contract7NotPresent:Setter Target="PART_Pane1.(Grid.Column)" Value="0"/> | ||
| <contract7NotPresent:Setter Target="PART_Pane1.(Grid.Row)" Value="0"/> | ||
|
|
||
| <contract7NotPresent:Setter Target="PART_Pane2.(Grid.Column)" Value="0"/> | ||
| <contract7NotPresent:Setter Target="PART_Pane2.(Grid.Row)" Value="2"/> | ||
|
|
||
| <contract7Present:Setter Target="PART_Pane1ScrollViewer.(Grid.Column)" Value="0"/> | ||
| <contract7Present:Setter Target="PART_Pane1ScrollViewer.(Grid.Row)" Value="0"/> | ||
|
|
||
| <contract7Present:Setter Target="PART_Pane2ScrollViewer.(Grid.Column)" Value="0"/> | ||
| <contract7Present:Setter Target="PART_Pane2ScrollViewer.(Grid.Row)" Value="2"/> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
|
|
||
| <VisualState x:Name="ViewMode_BottomTop"> | ||
| <VisualState.Setters> | ||
| <contract7NotPresent:Setter Target="PART_Pane1.(Grid.Column)" Value="0"/> | ||
| <contract7NotPresent:Setter Target="PART_Pane1.(Grid.Row)" Value="2"/> | ||
|
|
||
| <contract7NotPresent:Setter Target="PART_Pane2.(Grid.Column)" Value="0"/> | ||
| <contract7NotPresent:Setter Target="PART_Pane2.(Grid.Row)" Value="0"/> | ||
|
|
||
| <contract7Present:Setter Target="PART_Pane1ScrollViewer.(Grid.Column)" Value="0"/> | ||
| <contract7Present:Setter Target="PART_Pane1ScrollViewer.(Grid.Row)" Value="2"/> | ||
|
|
||
| <contract7Present:Setter Target="PART_Pane2ScrollViewer.(Grid.Column)" Value="0"/> | ||
| <contract7Present:Setter Target="PART_Pane2ScrollViewer.(Grid.Row)" Value="0"/> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
|
|
||
| <VisualState x:Name="ViewMode_OneOnly"> | ||
| <VisualState.Setters> | ||
| <contract7NotPresent:Setter Target="PART_Pane2.Visibility" Value="Collapsed"/> | ||
|
|
||
| <contract7Present:Setter Target="PART_Pane2ScrollViewer.Visibility" Value="Collapsed"/> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
|
|
||
| <VisualState x:Name="ViewMode_TwoOnly"> | ||
| <VisualState.Setters> | ||
| <contract7NotPresent:Setter Target="PART_Pane1.Visibility" Value="Collapsed"/> | ||
| <contract7NotPresent:Setter Target="PART_Pane2.(Grid.Column)" Value="0"/> | ||
|
|
||
| <contract7Present:Setter Target="PART_Pane1ScrollViewer.Visibility" Value="Collapsed"/> | ||
| <contract7Present:Setter Target="PART_Pane2ScrollViewer.(Grid.Column)" Value="0"/> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| </VisualStateGroup> | ||
| </VisualStateManager.VisualStateGroups> | ||
|
|
||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition x:Name="PART_ColumnLeft" Width="Auto"/> | ||
| <ColumnDefinition x:Name="PART_ColumnMiddle" Width="0"/> | ||
| <ColumnDefinition x:Name="PART_ColumnRight" Width="*"/> | ||
| </Grid.ColumnDefinitions> | ||
|
|
||
| <Grid.RowDefinitions> | ||
| <RowDefinition x:Name="PART_RowTop" Height="*"/> | ||
| <RowDefinition x:Name="PART_RowMiddle" Height="0"/> | ||
| <RowDefinition x:Name="PART_RowBottom" Height="0"/> | ||
| </Grid.RowDefinitions> | ||
|
|
||
| <contract7Present:ScrollViewer | ||
| x:Name="PART_Pane1ScrollViewer" | ||
| Grid.Column="0" | ||
| VerticalScrollBarVisibility="Auto"> | ||
| <Border Child="{TemplateBinding Pane1}" /> | ||
| </contract7Present:ScrollViewer> | ||
|
|
||
| <contract7Present:ScrollViewer | ||
| x:Name="PART_Pane2ScrollViewer" | ||
| Grid.Column="2" | ||
| VerticalScrollBarVisibility="Auto"> | ||
| <Border Child="{TemplateBinding Pane2}" /> | ||
| </contract7Present:ScrollViewer> | ||
|
|
||
| <contract7NotPresent:Border | ||
| x:Name="PART_Pane1" | ||
| Grid.Column="0" | ||
| Child="{TemplateBinding Pane1}"/> | ||
|
|
||
| <contract7NotPresent:Border | ||
| x:Name="PART_Pane2" | ||
| Grid.Column="2" | ||
| Child="{TemplateBinding Pane2}"/> | ||
|
|
||
| </Grid> | ||
| </ControlTemplate> | ||
| </Setter.Value> | ||
| </Setter> | ||
| <!-- MUX Reference TwoPaneView.xaml, tag winui3/release/1.4.2 --> | ||
| <ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | ||
| <Style x:Key="DefaultTwoPaneViewStyle" TargetType="controls:TwoPaneView"> | ||
| <Setter Property="HorizontalAlignment" Value="Stretch" /> | ||
| <Setter Property="VerticalAlignment" Value="Stretch" /> | ||
| <Setter Property="MinWideModeWidth" Value="641" /> | ||
| <Setter Property="MinTallModeHeight" Value="641" /> | ||
| <Setter Property="IsTabStop" Value="False" /> | ||
| <Setter Property="Template"> | ||
| <Setter.Value> | ||
| <ControlTemplate TargetType="controls:TwoPaneView"> | ||
| <Grid x:Name="RootGrid" Background="{TemplateBinding Background}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> | ||
| <VisualStateManager.VisualStateGroups> | ||
| <VisualStateGroup x:Name="ModeStates"> | ||
| <VisualState x:Name="ViewMode_LeftRight" /> | ||
| <VisualState x:Name="ViewMode_RightLeft"> | ||
| <VisualState.Setters> | ||
| <Setter Target="PART_Pane1ScrollViewer.(Grid.Column)" Value="2" /> | ||
| <Setter Target="PART_Pane2ScrollViewer.(Grid.Column)" Value="0" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="ViewMode_TopBottom"> | ||
| <VisualState.Setters> | ||
| <Setter Target="PART_Pane1ScrollViewer.(Grid.Column)" Value="0" /> | ||
| <Setter Target="PART_Pane1ScrollViewer.(Grid.Row)" Value="0" /> | ||
| <Setter Target="PART_Pane2ScrollViewer.(Grid.Column)" Value="0" /> | ||
| <Setter Target="PART_Pane2ScrollViewer.(Grid.Row)" Value="2" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="ViewMode_BottomTop"> | ||
| <VisualState.Setters> | ||
| <Setter Target="PART_Pane1ScrollViewer.(Grid.Column)" Value="0" /> | ||
| <Setter Target="PART_Pane1ScrollViewer.(Grid.Row)" Value="2" /> | ||
| <Setter Target="PART_Pane2ScrollViewer.(Grid.Column)" Value="0" /> | ||
| <Setter Target="PART_Pane2ScrollViewer.(Grid.Row)" Value="0" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="ViewMode_OneOnly"> | ||
| <VisualState.Setters> | ||
| <Setter Target="PART_Pane2ScrollViewer.Visibility" Value="Collapsed" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="ViewMode_TwoOnly"> | ||
| <VisualState.Setters> | ||
| <Setter Target="PART_Pane1ScrollViewer.Visibility" Value="Collapsed" /> | ||
| <Setter Target="PART_Pane2ScrollViewer.(Grid.Column)" Value="0" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| </VisualStateGroup> | ||
| </VisualStateManager.VisualStateGroups> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition x:Name="PART_ColumnLeft" Width="Auto" /> | ||
| <ColumnDefinition x:Name="PART_ColumnMiddle" Width="0" /> | ||
| <ColumnDefinition x:Name="PART_ColumnRight" Width="*" /> | ||
| </Grid.ColumnDefinitions> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition x:Name="PART_RowTop" Height="*" /> | ||
| <RowDefinition x:Name="PART_RowMiddle" Height="0" /> | ||
| <RowDefinition x:Name="PART_RowBottom" Height="0" /> | ||
| </Grid.RowDefinitions> | ||
| <ScrollViewer x:Name="PART_Pane1ScrollViewer" Grid.Column="0" VerticalScrollBarVisibility="Auto"> | ||
| <Border Child="{TemplateBinding Pane1}" /> | ||
| </ScrollViewer> | ||
| <ScrollViewer x:Name="PART_Pane2ScrollViewer" Grid.Column="2" VerticalScrollBarVisibility="Auto"> | ||
| <Border Child="{TemplateBinding Pane2}" /> | ||
| </ScrollViewer> | ||
| </Grid> | ||
| </ControlTemplate> | ||
| </Setter.Value> | ||
| </Setter> | ||
| </Style> | ||
|
|
||
| <Style TargetType="local:TwoPaneView" BasedOn="{StaticResource DefaultTwoPaneViewStyle}" /> | ||
|
|
||
| </ResourceDictionary> | ||
| <Style TargetType="controls:TwoPaneView" BasedOn="{StaticResource DefaultTwoPaneViewStyle}" /> | ||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Uno.UI/Microsoft/UI/Xaml/Controls/TwoPaneView/DisplayRegionHelper.Header.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Uno.UI/Microsoft/UI/Xaml/Controls/TwoPaneView/DisplayRegionHelper.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Uno.UI/Microsoft/UI/Xaml/Controls/TwoPaneView/DisplayRegionHelperInfo.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Uno.UI/Microsoft/UI/Xaml/Controls/TwoPaneView/DisplayRegionHelperTestApi.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.