Skip to content

Commit

Permalink
[AutoSuggestBox] Fix bug where find icon would be placed incorrectly …
Browse files Browse the repository at this point in the history 
…in control (#5779)

* Add test UI, fix bug

* Update verification files

* Update the visual verification files

* Update verification file

* Update verification files

Co-authored-by: Stephen Peters <stpete@microsoft.com>
  • Loading branch information
@marcelwgn @StephenLPeters
marcelwgn and StephenLPeters authored Oct 29, 2021
1 parent aff0350 commit 7762387
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 26 deletions.
2 changes: 1 addition & 1 deletion dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
Margin="{TemplateBinding BorderThickness}"
Padding="{TemplateBinding Padding}"
IsTabStop="False"
Grid.ColumnSpan="4"
Grid.ColumnSpan="2"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Content="{TemplateBinding PlaceholderText}"
Expand Down
2 changes: 1 addition & 1 deletion dev/AutoSuggestBox/AutoSuggestBox_themeresources_v1.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
Margin="{TemplateBinding BorderThickness}"
Padding="{TemplateBinding Padding}"
IsTabStop="False"
Grid.ColumnSpan="3"
Grid.ColumnSpan="2"
Content="{TemplateBinding PlaceholderText}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Expand Down
6 changes: 6 additions & 0 deletions dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
</AutoSuggestBox.QueryIcon>
</AutoSuggestBox>
<AutoSuggestBox Header="AutoSuggestBox with suggestions" QuerySubmitted="AutoSuggestBox_QuerySubmitted" />
<StackPanel x:Name="stackPanelSearch"
Margin="5"
Orientation="Horizontal">
<AutoSuggestBox Height="33" MinWidth="230"
PlaceholderText="Search Stuff" QueryIcon="Find" />
</StackPanel>
</StackPanel>

</local:TestPage>
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/AutoSuggestBox-4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=398,568
RenderSize=394,568
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -245,7 +245,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=382,557
RenderSize=378,557
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/AutoSuggestBox-5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=398,568
RenderSize=394,568
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -245,7 +245,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=382,557
RenderSize=378,557
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/AutoSuggestBox-6.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=398,568
RenderSize=394,568
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -245,7 +245,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=382,557
RenderSize=378,557
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/AutoSuggestBox-7.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=398,565
RenderSize=394,565
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -251,7 +251,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=382,554
RenderSize=378,554
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=266,31
RenderSize=262,31
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -1019,7 +1019,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=250,20
RenderSize=246,20
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=266,30
RenderSize=262,30
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -977,7 +977,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=250,19
RenderSize=246,19
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=266,30
RenderSize=262,30
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -977,7 +977,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=250,19
RenderSize=246,19
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1363,7 +1363,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=214,31
RenderSize=210,31
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -1377,7 +1377,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=198,20
RenderSize=194,20
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1363,7 +1363,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=214,31
RenderSize=210,31
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -1377,7 +1377,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=198,20
RenderSize=194,20
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-6.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1363,7 +1363,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=214,31
RenderSize=210,31
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -1377,7 +1377,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=198,20
RenderSize=194,20
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-7.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=214,30
RenderSize=210,30
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -1369,7 +1369,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=198,19
RenderSize=194,19
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-8.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,7 @@
Margin=1,1,1,1
Name=PlaceholderTextContentPresenter
Padding=10,5,6,6
RenderSize=214,30
RenderSize=210,30
Visibility=Visible
[Windows.UI.Xaml.Controls.ContentPresenter]
Background=[NULL]
Expand All @@ -1369,7 +1369,7 @@
Foreground=#9E000000
Margin=10,5,6,6
Padding=0,0,0,0
RenderSize=198,19
RenderSize=194,19
Visibility=Visible
[Windows.UI.Xaml.Controls.Button]
Background=#B3FFFFFF
Expand Down

0 comments on commit 7762387

Please sign in to comment.