Skip to content

Commit

Permalink
Add support for Content Alignment inside AutoSuggestBox (#3383)
Browse files Browse the repository at this point in the history
* Add content alignment support

* Remove test from PR, add defalt alignment parameters

* Add content alignment support to default textbox template

* Update verification files

* Update Vertificatin files

* Update verification files

* Remove unnecessary ver file
  • Loading branch information
beervoley authored Dec 14, 2020
1 parent 864c068 commit 31ca62b
Show file tree
Hide file tree
Showing 13 changed files with 234 additions and 63 deletions.
6 changes: 6 additions & 0 deletions dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
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}"
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
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
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
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
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
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

0 comments on commit 31ca62b

Please sign in to comment.