forked from microsoft/Windows-universal-samples
-
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.
Windows 10 future version - September 2018 Update 2
- Loading branch information
1 parent
5379e10
commit df6373e
Showing
26 changed files
with
650 additions
and
642 deletions.
There are no files selected for viewing
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
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
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
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
30 changes: 30 additions & 0 deletions
30
Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactDictionary.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 |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <ResourceDictionary | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:local="using:AppUIBasics.ControlPages"> | ||
|
|
||
| <Thickness x:Key="TextControlPlaceholderThemePadding">12,5,10,5</Thickness> | ||
| <x:Double x:Key="TextControlThemeMinHeight">23</x:Double> | ||
|
|
||
| <Style TargetType="TextBox"> | ||
| <Setter Property="Padding" Value="8,1,6,1" /> | ||
| <Setter Property="MinHeight" Value="23" /> | ||
| <Setter Property="MaxHeight" Value="48" /> | ||
| </Style> | ||
|
|
||
| <!--Password Box--> | ||
| <Style TargetType="PasswordBox"> | ||
| <Setter Property="Padding" Value="8,1,6,1" /> | ||
| <Setter Property="MinHeight" Value="23" /> | ||
| <Setter Property="MaxHeight" Value="48" /> | ||
| </Style> | ||
|
|
||
| <!--ComboBox--> | ||
| <Style TargetType="ComboBox"> | ||
| <Setter Property="Margin" Value="0,0,0,0" /> | ||
| <Setter Property="Padding" Value="12,0,0,0" /> | ||
| <Setter Property="MinHeight" Value="24" /> | ||
| <Setter Property="MaxHeight" Value="48" /> | ||
| </Style> | ||
|
|
||
| </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
43 changes: 12 additions & 31 deletions
43
Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactSizingPage.xaml.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,31 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Runtime.InteropServices.WindowsRuntime; | ||
| using Windows.Foundation; | ||
| using Windows.Foundation.Collections; | ||
| using Windows.UI.Xaml; | ||
| using Windows.UI.Xaml; | ||
| using Windows.UI.Xaml.Controls; | ||
| using Windows.UI.Xaml.Controls.Primitives; | ||
| using Windows.UI.Xaml.Data; | ||
| using Windows.UI.Xaml.Input; | ||
| using Windows.UI.Xaml.Media; | ||
| using Windows.UI.Xaml.Navigation; | ||
|
|
||
| // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 | ||
| using Windows.UI.Xaml.Media.Animation; | ||
| using AppUIBasics.SamplePages; | ||
|
|
||
| namespace AppUIBasics.ControlPages | ||
| { | ||
| /// <summary> | ||
| /// An empty page that can be used on its own or navigated to within a Frame. | ||
| /// </summary> | ||
| public sealed partial class CompactSizingPage : Page | ||
| { | ||
|
|
||
| ResourceDictionary compact = new ResourceDictionary(); | ||
| Uri source = new Uri("ms-appx:///ControlPages/CompactSizing.xaml"); | ||
|
|
||
| public CompactSizingPage() | ||
| { | ||
| this.InitializeComponent(); | ||
|
|
||
| } | ||
|
|
||
| private void Standard_Checked(object sender, RoutedEventArgs e) | ||
| private void Example1_Loaded(object sender, RoutedEventArgs e) | ||
| { | ||
| //compact.Source = source; | ||
| //CompactGrid.Resources.MergedDictionaries.Remove(compact); | ||
|
|
||
| ContentFrame.Navigate(typeof(SampleStandardSizingPage), null, new SuppressNavigationTransitionInfo()); | ||
| } | ||
|
|
||
| private void Standard_Checked(object sender, RoutedEventArgs e) | ||
| { | ||
| ContentFrame.Navigate(typeof(SampleStandardSizingPage), null, new SuppressNavigationTransitionInfo()); | ||
| } | ||
|
|
||
| private void Compact_Checked(object sender, RoutedEventArgs e) | ||
| { | ||
| //compact.Source = source; | ||
| //CompactGrid.Resources.MergedDictionaries.Insert(0, compact); | ||
|
|
||
| Frame.Navigate(typeof(StandardSizingPage)); | ||
| { | ||
| ContentFrame.Navigate(typeof(SampleCompactSizingPage), null, new SuppressNavigationTransitionInfo()); | ||
| } | ||
| } | ||
| } |
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.