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

Jump to bottom

[AutoSuggestBox] Make placeholder respect vertical and horizontal content alignment properties #5968

Merged
merged 5 commits into from
Oct 11, 2021
Merged

[AutoSuggestBox] Make placeholder respect vertical and horizontal content alignment properties #5968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47cfa31
Make placeholder vertically centered
marcelwgn Sep 25, 2021
0700955
Revert whitespace change
marcelwgn Sep 25, 2021
8154a1e
Bind placeholder contentaligment to corresponding properties
marcelwgn Sep 26, 2021
1a39e2c
Update verification files
marcelwgn Sep 27, 2021
47c4a66
Add new verification files
marcelwgn Oct 7, 2021
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: 2 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 @@ -345,6 +345,8 @@
Padding="{TemplateBinding Padding}"
IsTabStop="False"
Grid.ColumnSpan="4"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Content="{TemplateBinding PlaceholderText}"
IsHitTestVisible="False" />
<Button x:Name="DeleteButton"
Expand Down
2 changes: 2 additions & 0 deletions dev/AutoSuggestBox/AutoSuggestBox_themeresources_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@
IsTabStop="False"
Grid.ColumnSpan="3"
Content="{TemplateBinding PlaceholderText}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
IsHitTestVisible="False" />
<Button x:Name="DeleteButton"
Grid.Row="1"
Expand Down
304 changes: 304 additions & 0 deletions test/MUXControlsTestApp/verification/AutoSuggestBox-4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,304 @@
[Windows.UI.Xaml.Controls.AutoSuggestBox]
Background=#B3FFFFFF
BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
BorderThickness=1,1,1,1
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#E4000000
Margin=0,0,0,0
Padding=0,0,0,0
RenderSize=400,570
Visibility=Visible
Width=400
[Windows.UI.Xaml.Controls.Grid]
Background=[NULL]
BorderBrush=[NULL]
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Name=LayoutRoot
Padding=0,0,0,0
RenderSize=400,570
Visibility=Visible
[Windows.UI.Xaml.Controls.TextBox]
Background=#B3FFFFFF
BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
BorderThickness=1,1,1,1
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#E4000000
Margin=0,0,0,0
MinHeight=32
MinWidth=64
Name=TextBox
Padding=10,5,6,6
RenderSize=400,570
Visibility=Visible
Width=400
[Windows.UI.Xaml.Controls.Grid]
Background=[NULL]
BorderBrush=[NULL]
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Padding=0,0,0,0
RenderSize=400,570
Visibility=Visible
[Windows.UI.Xaml.Controls.Border]
Background=#B3FFFFFF
BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
BorderThickness=1,1,1,1
CornerRadius=4,4,4,4
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Name=BorderElement
Padding=0,0,0,0
RenderSize=400,570
Visibility=Visible
[Windows.UI.Xaml.Controls.ScrollViewer]
Background=#00FFFFFF
BorderBrush=#00FFFFFF
BorderThickness=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#E4000000
Margin=1,1,1,1
Name=ContentElement
Padding=10,5,6,6
RenderSize=394,568
Visibility=Visible
[Windows.UI.Xaml.Controls.Border]
Background=[NULL]
BorderBrush=#00FFFFFF
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Name=Root
Padding=0,0,0,0
RenderSize=394,568
Visibility=Visible
[Windows.UI.Xaml.Controls.Grid]
Background=#00FFFFFF
BorderBrush=[NULL]
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Padding=0,0,0,0
RenderSize=394,568
Visibility=Visible
[Windows.UI.Xaml.Controls.ScrollContentPresenter]
Background=[NULL]
BorderBrush=[NULL]
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#E4000000
Margin=10,5,6,6
Name=ScrollContentPresenter
Padding=0,0,0,0
RenderSize=378,557
Visibility=Visible
[Windows.UI.Xaml.FrameworkElement]
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
RenderSize=378,557
Visibility=Visible
[Windows.UI.Xaml.Controls.Grid]
Background=[NULL]
BorderBrush=[NULL]
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Padding=0,0,0,0
RenderSize=394,568
Visibility=Visible
[Windows.UI.Xaml.Controls.Grid]
Background=[NULL]
BorderBrush=[NULL]
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Padding=1,1,1,1
RenderSize=0,0
Visibility=Collapsed
[Windows.UI.Xaml.Controls.Primitives.ScrollBar]
Background=#00FFFFFF
BorderBrush=#00FFFFFF
BorderThickness=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#00FFFFFF
Margin=0,0,0,0
MinHeight=12
MinWidth=12
Name=VerticalScrollBar
Padding=0,0,0,0
RenderSize=0,0
Visibility=Visible
[Windows.UI.Xaml.Controls.Grid]
Background=[NULL]
BorderBrush=[NULL]
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Padding=1,1,1,1
RenderSize=0,0
Visibility=Collapsed
[Windows.UI.Xaml.Controls.Primitives.ScrollBar]
Background=#00FFFFFF
BorderBrush=#00FFFFFF
BorderThickness=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#00FFFFFF
Margin=0,0,0,0
MinHeight=12
MinWidth=12
Name=HorizontalScrollBar
Padding=0,0,0,0
RenderSize=0,0
Visibility=Visible
[Windows.UI.Xaml.Controls.Border]
Background=#00FFFFFF
BorderBrush=[NULL]
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Name=ScrollBarSeparator
Padding=0,0,0,0
RenderSize=0,0
Visibility=Collapsed
[Windows.UI.Xaml.Controls.ContentControl]
Background=[NULL]
BorderBrush=[NULL]
BorderThickness=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#9E000000
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=398,568
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
BorderBrush=[NULL]
BorderThickness=0,0,0,0
CornerRadius=0,0,0,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=382,557
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
BorderThickness=1,1,1,1
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#E4000000
Margin=0,0,0,0
Name=DeleteButton
Padding=0,0,-2,0
RenderSize=0,0
Visibility=Collapsed
Width=32
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
BorderThickness=1,1,1,1
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#E4000000
Height=28
Margin=2,0,0,0
Name=QueryButton
Padding=0,0,-2,0
RenderSize=32,28
Visibility=Collapsed
Width=32
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=#00FFFFFF
BorderBrush=#00FFFFFF
BorderThickness=1,1,1,1
CornerRadius=0,4,4,0
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#E4000000
Margin=1,3,1,3
Name=ContentPresenter
Padding=0,0,-2,0
RenderSize=30,22
Visibility=Visible
[Windows.UI.Xaml.Controls.Primitives.Popup]
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Name=SuggestionsPopup
RenderSize=400,570
Visibility=Visible
Loading