Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patched AdaptiveTrigger #56

Merged
merged 2 commits into from
Sep 17, 2019
Merged

Patched AdaptiveTrigger #56

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
9de23ee
Fixed AdaptiveTrigger
carldebilly Sep 17, 2019
903876b
Update to version of PivotPanel fixing the infinite measure problem
carldebilly Sep 17, 2019
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
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid80' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 7 additions & 6 deletions Microsoft.Toolkit.Uwp.SampleApp.Shared/Pages/SampleController.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<Grid>

<Grid x:Name="RootGrid">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
<ColumnDefinition x:Name="SideColumn" />
Expand Down Expand Up @@ -169,6 +169,7 @@
Visibility="{x:Bind CanChangePaneState}"
Icon="ClosePane"
Width="50"
Height="50"
Click="{x:Bind ExpandCollapsePane}" />
</Pivot.LeftHeader>

Expand Down Expand Up @@ -273,6 +274,11 @@
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="WindowStates"
CurrentStateChanged="WindowStates_CurrentStateChanged">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="700" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.Setters>
<Setter Target="NarrowInfoButton.Visibility" Value="Visible" />
Expand All @@ -291,11 +297,6 @@
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="700" />
</VisualState.StateTriggers>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="PaneStates"
CurrentStateChanged="PaneStates_CurrentStateChanged">
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.SampleApp.Wasm/Microsoft.Toolkit.Uwp.SampleApp.Wasm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.302" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
Expand Down
3 changes: 2 additions & 1 deletion Microsoft.Toolkit.Uwp.SampleApp.Wasm/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Microsoft.Extensions.Logging;
using Uno.Extensions;
using Windows.UI.Xaml;
using Uno.UI;

namespace Microsoft.Toolkit.Uwp.SampleApp.Wasm
{
Expand All @@ -12,7 +13,7 @@ public static class Program

static void Main(string[] args)
{

FeatureConfiguration.UIElement.AssignDOMXamlName = true;
Application.Start(e => new App());
}
}
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.SampleApp.iOS/Microsoft.Toolkit.Uwp.SampleApp.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.1-uno.28</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
</ItemGroup>

<Import Project="..\uno.ui.include.props" />
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1-uno.26" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1-uno.28" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
</ItemGroup>

Expand All @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
</ItemGroup>

<Import Project="..\uno.ui.include.props" />
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid80' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.UI.Controls.Graph/Microsoft.Toolkit.Uwp.UI.Controls.Graph.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.13.7" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
</ItemGroup>

<Import Project="..\uno.ui.include.props" />
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2711" />
<PackageReference Include="Uno.UI" Version="1.46.230-dev.2723" />
</ItemGroup>

<Import Project="..\uno.ui.include.props" />
Expand Down