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

Revert #5872 #6552

Merged
merged 2 commits into from
Jan 10, 2022
Merged

Revert #5872 #6552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe3348d
revert 5872
StephenLPeters Jan 5, 2022
1fedbdb
update visual verification files for consistently failing, but unrela…
StephenLPeters Jan 6, 2022
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
12 changes: 4 additions & 8 deletions dev/CommonStyles/ContentDialog_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@
<Setter Property="PrimaryButtonStyle" Value="{ThemeResource DefaultButtonStyle}" />
<Setter Property="SecondaryButtonStyle" Value="{ThemeResource DefaultButtonStyle}" />
<Setter Property="CloseButtonStyle" Value="{ThemeResource DefaultButtonStyle}" />
<Setter Property="MinWidth" Value="{ThemeResource ContentDialogMinWidth}" />
<Setter Property="MaxWidth" Value="{ThemeResource ContentDialogMaxWidth}" />
<Setter Property="MinHeight" Value="{ThemeResource ContentDialogMinHeight}" />
<Setter Property="MaxHeight" Value="{ThemeResource ContentDialogMaxHeight}" />
<contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
<Setter Property="Template">
<Setter.Value>
Expand Down Expand Up @@ -247,10 +243,10 @@
BorderBrush="{TemplateBinding BorderBrush}"
contract7Present:BackgroundSizing="InnerBorderEdge"
contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
MinWidth="{TemplateBinding MinWidth}"
MaxWidth="{TemplateBinding MaxWidth}"
MinHeight="{TemplateBinding MinHeight}"
MaxHeight="{TemplateBinding MaxHeight}"
MinWidth="{ThemeResource ContentDialogMinWidth}"
MaxWidth="{ThemeResource ContentDialogMaxWidth}"
MinHeight="{ThemeResource ContentDialogMinHeight}"
MaxHeight="{ThemeResource ContentDialogMaxHeight}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
RenderTransformOrigin="0.5,0.5">
Expand Down
12 changes: 4 additions & 8 deletions dev/CommonStyles/ContentDialog_themeresources_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@
<Setter Property="PrimaryButtonStyle" Value="{ThemeResource DefaultButtonStyle}" />
<Setter Property="SecondaryButtonStyle" Value="{ThemeResource DefaultButtonStyle}" />
<Setter Property="CloseButtonStyle" Value="{ThemeResource DefaultButtonStyle}" />
<Setter Property="MinWidth" Value="{ThemeResource ContentDialogMinWidth}" />
<Setter Property="MaxWidth" Value="{ThemeResource ContentDialogMaxWidth}" />
<Setter Property="MinHeight" Value="{ThemeResource ContentDialogMinHeight}" />
<Setter Property="MaxHeight" Value="{ThemeResource ContentDialogMaxHeight}" />
<contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
<Setter Property="Template">
<Setter.Value>
Expand Down Expand Up @@ -291,10 +287,10 @@
BorderBrush="{TemplateBinding BorderBrush}"
contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}"
MinWidth="{TemplateBinding MinWidth}"
MaxWidth="{TemplateBinding MaxWidth}"
MinHeight="{TemplateBinding MinHeight}"
MaxHeight="{TemplateBinding MaxHeight}"
MinWidth="{ThemeResource ContentDialogMinWidth}"
MaxWidth="{ThemeResource ContentDialogMaxWidth}"
MinHeight="{ThemeResource ContentDialogMinHeight}"
MaxHeight="{ThemeResource ContentDialogMaxHeight}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
RenderTransformOrigin="0.5,0.5">
Expand Down
27 changes: 1 addition & 26 deletions test/MUXControlsTestApp/verification/CalendarView-4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Name=MonthViewPanel
RenderSize=398,559413
RenderSize=398,559360
Visibility=Visible
[Windows.UI.Xaml.Controls.CalendarViewDayItem]
Background=[NULL]
Expand Down Expand Up @@ -5613,31 +5613,6 @@
Padding=0,0,0,0
RenderSize=22,27
Visibility=Visible
[Windows.UI.Xaml.Controls.CalendarViewDayItem]
Background=[NULL]
BorderBrush=[NULL]
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
MinHeight=40
MinWidth=40
Padding=0,0,0,4
RenderSize=55,51
Visibility=Visible
[Windows.UI.Xaml.Controls.TextBlock]
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=22,27
Visibility=Visible
[Windows.UI.Xaml.Controls.ScrollViewer]
Background=#00FFFFFF
BorderBrush=#00FFFFFF
Expand Down
27 changes: 1 addition & 26 deletions test/MUXControlsTestApp/verification/CalendarView-6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Name=MonthViewPanel
RenderSize=398,559413
RenderSize=398,559360
Visibility=Visible
[Windows.UI.Xaml.Controls.CalendarViewDayItem]
Background=[NULL]
Expand Down Expand Up @@ -5613,31 +5613,6 @@
Padding=0,0,0,0
RenderSize=22,27
Visibility=Visible
[Windows.UI.Xaml.Controls.CalendarViewDayItem]
Background=[NULL]
BorderBrush=[NULL]
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
MinHeight=40
MinWidth=40
Padding=0,0,0,4
RenderSize=55,51
Visibility=Visible
[Windows.UI.Xaml.Controls.TextBlock]
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=22,27
Visibility=Visible
[Windows.UI.Xaml.Controls.ScrollViewer]
Background=#00FFFFFF
BorderBrush=#00FFFFFF
Expand Down
28 changes: 1 addition & 27 deletions test/MUXControlsTestApp/verification/CalendarView-7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
FocusVisualSecondaryThickness=1,1,1,1
Margin=0,0,0,0
Name=MonthViewPanel
RenderSize=398,559413
RenderSize=398,559360
Visibility=Visible
[Windows.UI.Xaml.Controls.CalendarViewDayItem]
Background=[NULL]
Expand Down Expand Up @@ -5828,32 +5828,6 @@
Padding=0,0,0,0
RenderSize=22,27
Visibility=Visible
[Windows.UI.Xaml.Controls.CalendarViewDayItem]
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=1,1,1,1
MinHeight=40
MinWidth=40
Padding=0,0,0,4
RenderSize=55,51
Visibility=Visible
[Windows.UI.Xaml.Controls.TextBlock]
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=22,27
Visibility=Visible
[Windows.UI.Xaml.Controls.ScrollViewer]
Background=#00FFFFFF
BorderBrush=#00FFFFFF
Expand Down
4 changes: 1 addition & 3 deletions test/MUXControlsTestApp/verification/ContentDialog-4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
Margin=0,0,0,0
MaxHeight=756
MaxWidth=548
MinHeight=184
MinWidth=320
Padding=0,0,0,0
RenderSize=320,184
RenderSize=0,0
Visibility=Visible
[Windows.UI.Xaml.Controls.Border]
Background=[NULL]
Expand Down
4 changes: 0 additions & 4 deletions test/MUXControlsTestApp/verification/ContentDialog-5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#E4000000
Margin=0,0,0,0
MaxHeight=756
MaxWidth=548
MinHeight=184
MinWidth=320
Padding=0,0,0,0
RenderSize=0,0
Visibility=Visible
Expand Down
172 changes: 0 additions & 172 deletions test/MUXControlsTestApp/verification/ContentDialog-6.xml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions test/MUXControlsTestApp/verification/ContentDialog-7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
FocusVisualSecondaryThickness=1,1,1,1
Foreground=#E4000000
Margin=0,0,0,0
MaxHeight=756
MaxWidth=548
MinHeight=184
MinWidth=320
Padding=0,0,0,0
RenderSize=0,0
Visibility=Visible
Expand Down
Loading