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

Combobox visual updates #3938

Merged
merged 21 commits into from
Feb 1, 2021
Merged

Combobox visual updates #3938

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
069268e
Update combobox
beervoley Jan 13, 2021
7b9ffa8
Update disabled brushes
beervoley Jan 14, 2021
5c117fe
Revert disabled brushes
beervoley Jan 14, 2021
4f827ab
reverse textbox changes
beervoley Jan 15, 2021
da0634a
dev/CommonStyles/TextBox_themeresources.xamlMerge remote-tracking bra…
beervoley Jan 15, 2021
9a5cc25
Merge remote-tracking branch 'origin/master' into vsiliushi/combobox_…
beervoley Jan 15, 2021
9e66a8c
Update tests, remove unnecessary resource
beervoley Jan 16, 2021
62c3ac3
Restore Header margin
beervoley Jan 16, 2021
aa2116c
Merge remote-tracking branch 'origin/master' into vsiliushi/combobox_…
beervoley Jan 20, 2021
5391b56
Merge remote-tracking branch 'origin' into vsiliushi/combobox_update
beervoley Jan 28, 2021
70c51cb
Update ghost to subtle
beervoley Jan 28, 2021
a6d5669
Revert header margin test
beervoley Jan 28, 2021
b11c4c0
restore permissions
beervoley Jan 28, 2021
7678eb5
revert permissions
beervoley Jan 28, 2021
40ee5ef
Fix header test for combobox only
beervoley Jan 28, 2021
7f769c0
verification files update
beervoley Jan 28, 2021
4812559
Update margin for focus visual
beervoley Jan 28, 2021
f6b4e52
Address PR comments
beervoley Jan 29, 2021
35db37d
Remove repeated resources
beervoley Jan 30, 2021
bde655e
Fix wrong type for resource
beervoley Jan 30, 2021
96ce1d5
Fix tests
beervoley Jan 31, 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
280 changes: 183 additions & 97 deletions dev/ComboBox/ComboBox_themeresources.xaml
100644 → 100755
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ private void HeaderContentPresenterMarginTest(DependencyObject control)
var root = (FrameworkElement)VisualTreeHelper.GetChild(control, 0);
var contentPresenter = (ContentPresenter)root.FindName("HeaderContentPresenter");
simpleVerify.IsTrue(contentPresenter != null, "HeaderContentPresenter can't be found");

string expectedHeaderMargin = "0,0,0,4";
string expectedHeaderMargin = control == ComboBox ? "0,0,0,8" : "0,0,0,4";
if (contentPresenter != null)
{
simpleVerify.IsEqual(contentPresenter.Margin.ToString(), expectedHeaderMargin, "HeaderContentPresenter.Margin");
Expand Down
34 changes: 23 additions & 11 deletions test/MUXControlsTestApp/verification/ComboBox-4.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Padding=12,5,0,7
Foreground=#E4000000
BorderThickness=1,1,1,1
BorderBrush=#0F000000
BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
Background=#B3FFFFFF
MinWidth=64
Margin=0,0,0,0
Expand All @@ -29,32 +29,44 @@
[Windows.UI.Xaml.Controls.Border]
Padding=0,0,0,0
CornerRadius=4,4,4,4
BorderThickness=1,1,1,1
BorderBrush=#0F000000
BorderThickness=2,2,2,2
BorderBrush=#E4000000
Background=#B3FFFFFF
Name=Background
MinWidth=64
Margin=0,0,0,0
Name=HighlightBackground
Margin=-4,-4,-4,-4
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=64,32
RenderSize=72,40
[Windows.UI.Xaml.Controls.Border]
Padding=0,0,0,0
CornerRadius=4,4,4,4
BorderThickness=1,1,1,1
BorderBrush=#0F000000
Background=#0A000000
Name=HighlightBackground
BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
Background=#B3FFFFFF
Name=Background
MinWidth=64
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=64,32
[Windows.UI.Xaml.Shapes.Rectangle]
StrokeThickness=1
Width=3
Name=Pill
Margin=1,0,0,0
Height=16
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
FocusVisualPrimaryBrush=#FF000000
Visibility=Visible
RenderSize=3,16
[Windows.UI.Xaml.Controls.ContentPresenter]
Foreground=#E4000000
Padding=0,0,0,0
Expand Down Expand Up @@ -85,7 +97,7 @@
Foreground=#93000000
Name=DropDownGlyph
MinHeight=32
Margin=0,0,10,0
Margin=0,0,14,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
126 changes: 0 additions & 126 deletions test/MUXControlsTestApp/verification/ComboBox-5.xml
View file
Open in desktop

This file was deleted.

126 changes: 0 additions & 126 deletions test/MUXControlsTestApp/verification/ComboBox-6.xml
View file
Open in desktop

This file was deleted.

Loading