Skip to content

Commit 6372a3c

Browse files
kazo0kazo0
authored
Merge branch 'master' into dev/maso/lightweightpipspager2
2 parents 592041a + b7a0c9a commit 6372a3c

File tree

45 files changed

+3807
-864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3807
-864
lines changed

‎doc/material-controls-styles.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ TextBlock|BodySmall|
6464
TextBlock|CaptionLarge|
6565
TextBlock|CaptionMedium|
6666
TextBlock|CaptionSmall|
67-
TextBox|FilledTextBoxStyle|True
68-
TextBox|OutlinedTextBoxStyle|
67+
TextBox|FilledTextBoxStyle|
68+
TextBox|OutlinedTextBoxStyle|True
6969
ToggleButton|TextToggleButtonStyle|True
7070
ToggleButton|IconToggleButtonStyle|
7171
ToggleSwitch|ToggleSwitchStyle|True

‎doc/styles/TextBox.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
Style Key|IsDefaultStyle*
55
-|-
6-
FilledTextBoxStyle|True
7-
OutlinedTextBoxStyle|
6+
FilledTextBoxStyle|
7+
OutlinedTextBoxStyle|True
88

99
IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control
1010

‎src/library/Uno.Cupertino/Uno.Cupertino.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.1148" Condition="!$(_IsWinUI)" />
5757

58-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" Condition="$(_IsWinUI)" />
58+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.0" Condition="$(_IsWinUI)" />
5959
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="$(_IsWinUI)" />
6060
</ItemGroup>
6161

‎src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
1+
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22

33
<!--
44
Adding project references to this project requires some manual adjustments.
@@ -19,7 +19,7 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="1.0.0-dev.187" />
22+
<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="5.0.0-dev.407" />
2323
</ItemGroup>
2424

2525
<PropertyGroup>

‎src/library/Uno.Material/Styles/Controls/v2/MediaPlayerElement.xaml

+677
Large diffs are not rendered by default.

‎src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
<ResourceDictionary x:Key="Default">
1010
<StaticResource x:Key="ProgressBarForeground" ResourceKey="PrimaryBrush" />
1111
<StaticResource x:Key="ProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
12+
1213
<x:Double x:Key="ProgressBarMinWidth">250</x:Double>
1314
<x:Double x:Key="ProgressBarHeight">4</x:Double>
1415
</ResourceDictionary>
1516
<ResourceDictionary x:Key="Light">
1617
<StaticResource x:Key="ProgressBarForeground" ResourceKey="PrimaryBrush" />
1718
<StaticResource x:Key="ProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
19+
1820
<x:Double x:Key="ProgressBarMinWidth">250</x:Double>
1921
<x:Double x:Key="ProgressBarHeight">4</x:Double>
2022
</ResourceDictionary>

‎src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<Style BasedOn="{StaticResource MaterialDefaultHyperlinkButtonStyle}" TargetType="HyperlinkButton" />
2323
<Style BasedOn="{StaticResource MaterialDefaultListViewItemStyle}" TargetType="ListViewItem" />
2424
<Style BasedOn="{StaticResource MaterialDefaultListViewStyle}" TargetType="ListView" />
25+
<Style BasedOn="{StaticResource MaterialDefaultMediaTransportControlsStyle}" TargetType="MediaTransportControls" />
2526
<Style BasedOn="{StaticResource MaterialDefaultMenuFlyoutItemStyle}" TargetType="MenuFlyoutItem" />
2627
<Style BasedOn="{StaticResource MaterialDefaultMenuFlyoutPresenterStyle}" TargetType="MenuFlyoutPresenter" />
2728
<Style BasedOn="{StaticResource MaterialDefaultMenuFlyoutSeparatorStyle}" TargetType="MenuFlyoutSeparator" />
@@ -58,6 +59,7 @@
5859
<StaticResource x:Key="IconToggleButtonStyle" ResourceKey="MaterialIconToggleButtonStyle" />
5960
<StaticResource x:Key="ListViewItemStyle" ResourceKey="MaterialListViewItemStyle" />
6061
<StaticResource x:Key="ListViewStyle" ResourceKey="MaterialListViewStyle" />
62+
<StaticResource x:Key="MediaTransportControlsStyle" ResourceKey="MaterialMediaTransportControlsStyle" />
6163
<StaticResource x:Key="MenuFlyoutItemStyle" ResourceKey="MaterialMenuFlyoutItemStyle" />
6264
<StaticResource x:Key="MenuFlyoutPresenterStyle" ResourceKey="MaterialMenuFlyoutPresenterStyle" />
6365
<StaticResource x:Key="MenuFlyoutSeparatorStyle" ResourceKey="MaterialMenuFlyoutSeparatorStyle" />

‎src/library/Uno.Material/Uno.Material.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.1148" Condition="!$(_IsWinUI)" />
6262

63-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" Condition="$(_IsWinUI)" />
63+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.0" Condition="$(_IsWinUI)" />
6464
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="$(_IsWinUI)" />
6565
</ItemGroup>
6666

‎src/library/Uno.Themes.WinUI.Markup/ResourceValue.cs

-25
This file was deleted.

0 commit comments

Comments
 (0)