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

Add support for Content Alignment inside AutoSuggestBox #3383

Merged
merged 11 commits into from
Dec 14, 2020
Merged

Add support for Content Alignment inside AutoSuggestBox #3383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9bbae40
Add content alignment support
beervoley Oct 6, 2020
9e81689
Remove test from PR, add defalt alignment parameters
beervoley Oct 6, 2020
f2948fd
Add content alignment support to default textbox template
beervoley Oct 7, 2020
5f8502a
Update verification files
beervoley Oct 13, 2020
3a19faf
Merge branch 'master' into user/vsiliush/AutoSuggestBoxTextAlignment
beervoley Oct 20, 2020
da617a3
Merge branch 'master' into user/vsiliush/AutoSuggestBoxTextAlignment
beervoley Oct 20, 2020
e042c9e
Merge branch 'master' into user/vsiliush/AutoSuggestBoxTextAlignment
beervoley Oct 21, 2020
4aed5d8
Merge branch 'master' into user/vsiliush/AutoSuggestBoxTextAlignment
beervoley Oct 22, 2020
6c1e929
Update Vertificatin files
beervoley Oct 22, 2020
7ceebc4
Update verification files
beervoley Oct 22, 2020
25d54da
Remove unnecessary ver file
beervoley Oct 25, 2020
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
6 changes: 6 additions & 0 deletions dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,8 @@
IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
beervoley marked this conversation as resolved.
Show resolved Hide resolved
Margin="{TemplateBinding BorderThickness}"
Padding="{TemplateBinding Padding}"
IsTabStop="False"
Expand Down Expand Up @@ -372,6 +374,8 @@

<Style x:Key="DefaultAutoSuggestBoxStyle" TargetType="AutoSuggestBox">
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="VerticalContentAlignment" Value="Top"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="IsTabStop" Value="False" />
<Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
<Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
Expand Down Expand Up @@ -418,6 +422,8 @@
FontFamily="{TemplateBinding FontFamily}"
FontWeight="{TemplateBinding FontWeight}"
FontStretch="{TemplateBinding FontStretch}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
ScrollViewer.BringIntoViewOnFocusChange="False"
Canvas.ZIndex="0"
Margin="0"
Expand Down
4 changes: 4 additions & 0 deletions dev/CommonStyles/TextBox_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
<Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
<Setter Property="VerticalContentAlignment" Value="Top"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
<Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
<Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}" />
Expand Down Expand Up @@ -314,6 +316,8 @@
IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
Margin="{TemplateBinding BorderThickness}"
Padding="{TemplateBinding Padding}"
IsTabStop="False"
Expand Down
18 changes: 9 additions & 9 deletions test/MUXControlsTestApp/verification/AppBarToggleButton-4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
RenderSize=68,40
[Windows.UI.Xaml.Controls.Grid]
Padding=0,0,0,0
CornerRadius=0,0,0,0
Expand All @@ -40,7 +40,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
RenderSize=68,40
[Windows.UI.Xaml.Shapes.Rectangle]
StrokeThickness=1
Name=CheckedHighlightBackground
Expand All @@ -50,7 +50,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
RenderSize=68,40
[Windows.UI.Xaml.Shapes.Rectangle]
StrokeThickness=1
Name=AccentOverlayBackground
Expand All @@ -60,7 +60,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
RenderSize=68,40
[Windows.UI.Xaml.Shapes.Rectangle]
StrokeThickness=1
Name=AppBarToggleButtonInnerBorder
Expand All @@ -70,22 +70,22 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
RenderSize=68,40
[Windows.UI.Xaml.Controls.Grid]
Padding=0,0,0,0
CornerRadius=0,0,0,0
BorderThickness=0,0,0,0
BorderBrush=[NULL]
Background=[NULL]
Name=ContentRoot
MinHeight=56
MinHeight=40
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
RenderSize=68,40
[Windows.UI.Xaml.Controls.TextBlock]
Padding=0,0,0,0
Foreground=#FF000000
Expand Down Expand Up @@ -146,8 +146,8 @@
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=64,16
Visibility=Collapsed
RenderSize=0,0
[Windows.UI.Xaml.Controls.TextBlock]
Padding=0,5,0,8
Foreground=#FF000000
Expand Down
161 changes: 161 additions & 0 deletions test/MUXControlsTestApp/verification/AppBarToggleButton-5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
[Windows.UI.Xaml.Controls.Grid]
Padding=0,0,0,0
CornerRadius=0,0,0,0
BorderThickness=0,0,0,0
BorderBrush=[NULL]
Background=[NULL]
Width=400
Margin=0,0,0,0
Height=400
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=400,400
[Windows.UI.Xaml.Controls.AppBarToggleButton]
Padding=0,0,0,0
Foreground=#FF000000
BorderThickness=0,0,0,0
BorderBrush=#00FFFFFF
Background=#00FFFFFF
Width=68
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
[Windows.UI.Xaml.Controls.Grid]
Padding=0,0,0,0
CornerRadius=0,0,0,0
BorderThickness=0,0,0,0
BorderBrush=#00FFFFFF
Background=#00FFFFFF
Name=Root
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
[Windows.UI.Xaml.Shapes.Rectangle]
StrokeThickness=1
Name=CheckedHighlightBackground
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
[Windows.UI.Xaml.Shapes.Rectangle]
StrokeThickness=1
Name=AccentOverlayBackground
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
[Windows.UI.Xaml.Shapes.Rectangle]
StrokeThickness=1
Name=AppBarToggleButtonInnerBorder
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
[Windows.UI.Xaml.Controls.Grid]
Padding=0,0,0,0
CornerRadius=0,0,0,0
BorderThickness=0,0,0,0
BorderBrush=[NULL]
Background=[NULL]
Name=ContentRoot
MinHeight=56
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=68,56
[Windows.UI.Xaml.Controls.TextBlock]
Padding=0,0,0,0
Foreground=#FF000000
Width=14
Name=OverflowCheckGlyph
Margin=12,4,12,4
Height=14
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Collapsed
RenderSize=0,0
[Windows.UI.Xaml.Controls.Viewbox]
Name=ContentViewbox
Margin=0,12,0,4
Height=16
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=0,0
[Windows.UI.Xaml.Controls.Border]
Padding=0,0,0,0
CornerRadius=0,0,0,0
BorderThickness=0,0,0,0
BorderBrush=[NULL]
Background=[NULL]
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=0,0
[Windows.UI.Xaml.Controls.ContentPresenter]
Foreground=#FF000000
Padding=0,0,0,0
CornerRadius=0,0,0,0
BorderThickness=0,0,0,0
BorderBrush=[NULL]
Background=[NULL]
Name=Content
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=0,0
[Windows.UI.Xaml.Controls.TextBlock]
Padding=0,0,0,0
Foreground=#FF000000
Name=TextLabel
Margin=2,0,2,8
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=64,16
[Windows.UI.Xaml.Controls.TextBlock]
Padding=0,5,0,8
Foreground=#FF000000
Name=OverflowTextLabel
Margin=38,0,12,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Collapsed
RenderSize=0,0
12 changes: 6 additions & 6 deletions test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=272,31
RenderSize=17,31
[Windows.UI.Xaml.Controls.Border]
Padding=0,0,0,0
CornerRadius=0,0,0,0
Expand All @@ -807,7 +807,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=272,31
RenderSize=17,31
[Windows.UI.Xaml.Controls.Grid]
Padding=0,0,0,0
CornerRadius=0,0,0,0
Expand All @@ -820,7 +820,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=272,31
RenderSize=17,31
[Windows.UI.Xaml.Controls.ScrollContentPresenter]
Foreground=#FF000000
Padding=0,0,0,0
Expand All @@ -835,15 +835,15 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=256,20
RenderSize=1,20
[Windows.UI.Xaml.FrameworkElement]
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=256,20
RenderSize=1,20
[Windows.UI.Xaml.Controls.Grid]
Padding=0,0,0,0
CornerRadius=0,0,0,0
Expand All @@ -856,7 +856,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=272,31
RenderSize=17,31
[Windows.UI.Xaml.Controls.Primitives.ScrollBar]
Padding=0,0,0,0
Foreground=#00FFFFFF
Expand Down
12 changes: 6 additions & 6 deletions test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=272,30
RenderSize=17,30
[Windows.UI.Xaml.Controls.Border]
Padding=0,0,0,0
CornerRadius=0,0,0,0
Expand All @@ -826,7 +826,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=272,30
RenderSize=17,30
[Windows.UI.Xaml.Controls.Grid]
Padding=0,0,0,0
CornerRadius=0,0,0,0
Expand All @@ -839,7 +839,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=272,30
RenderSize=17,30
[Windows.UI.Xaml.Controls.ScrollContentPresenter]
Foreground=#FF000000
Padding=0,0,0,0
Expand All @@ -854,15 +854,15 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=256,19
RenderSize=1,19
[Windows.UI.Xaml.FrameworkElement]
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=256,19
RenderSize=1,19
[Windows.UI.Xaml.Controls.Grid]
Padding=0,0,0,0
CornerRadius=0,0,0,0
Expand All @@ -875,7 +875,7 @@
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=272,30
RenderSize=17,30
[Windows.UI.Xaml.Controls.Primitives.ScrollBar]
Padding=0,0,0,0
Foreground=#00FFFFFF
Expand Down
Loading