Skip to content

Commit

Permalink
[ContentDialog] Add missing visibility setter for V2 style (#5736)
Browse files Browse the repository at this point in the history 
* Add missing visibility setter

* update verification files

Co-authored-by: Karen Lai <[email protected]>
Co-authored-by: Karen Lai <[email protected]>
  • Loading branch information
@marcelwgn @karkarl
3 people authored Nov 11, 2021
1 parent 04b7230 commit a5050d3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 743 deletions.
3 changes: 2 additions & 1 deletion dev/CommonStyles/ContentDialog_themeresources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<Grid x:Name="LayoutRoot">
<Grid x:Name="LayoutRoot"
contract5Present:Visibility="Collapsed">
<Rectangle x:Name="SmokeLayerBackground" Fill="{ThemeResource ContentDialogSmokeFill}" />
<Border
x:Name="BackgroundElement"
Expand Down
185 changes: 1 addition & 184 deletions test/MUXControlsTestApp/verification/ContentDialog-5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
Name=LayoutRoot
Padding=0,0,0,0
RenderSize=0,0
Visibility=Visible
Visibility=Collapsed
[Windows.UI.Xaml.Shapes.Rectangle]
FocusVisualPrimaryBrush=#E4000000
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -114,189 +114,6 @@
Padding=0,0,0,0
RenderSize=0,0
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=0,0
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=0,0
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=0,0,0,0
Name=ScrollContentPresenter
Padding=0,0,0,0
RenderSize=0,0
Visibility=Visible
[Windows.UI.Xaml.Controls.Grid]
Background=#FFFFFFFF
BorderBrush=#0F000000
BorderThickness=0,0,0,1
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=24,24,24,24
RenderSize=0,0
Visibility=Visible
[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=#E4000000
Margin=0,0,0,12
Name=Title
Padding=0,0,0,0
RenderSize=0,0
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=#E4000000
Margin=0,0,0,0
Padding=0,0,0,0
RenderSize=0,0
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=#E4000000
Margin=0,0,0,0
Name=Content
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=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=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.Grid]
Background=#FFF3F3F3
BorderBrush=[NULL]
Expand Down
Loading

0 comments on commit a5050d3

Please sign in to comment.