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

Theme The "Generate Overrides" Dialog #62244

Merged
merged 2 commits into from
Jul 1, 2022
Merged

Theme The "Generate Overrides" Dialog #62244

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
5c880ef
WIP
ryzngard Jun 13, 2022
cbb3559
Fix themes for everything
ryzngard Jun 29, 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
30 changes: 19 additions & 11 deletions src/VisualStudio/Core/Def/PickMembers/PickMembersDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
xmlns:u="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
xmlns:vsshell="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:platformimaging="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Imaging"
mc:Ignorable="d"
d:DesignHeight="380" d:DesignWidth="460"
Height="380" Width="460"
Expand All @@ -21,12 +23,17 @@
ResizeMode="CanResizeWithGrip"
ShowInTaskbar="False"
HasDialogFrame="True"
WindowStartupLocation="CenterOwner">
WindowStartupLocation="CenterOwner"
vs:ThemedDialogStyleLoader.UseDefaultThemedDialogStyles="True"
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
platformimaging:ImageThemingUtilities.ImageBackgroundColor="{StaticResource {x:Static vsshell:VsColors.ToolWindowBackgroundKey}}">
<Window.Resources>
<Style TargetType="ListBoxItem">
<Setter Property="IsTabStop"
Value="False" />
</Style>

<Style TargetType="u:AutomationDelegatingListView" BasedOn="{StaticResource {x:Static vsshell:VsResourceKeys.ThemedDialogListViewStyleKey}}" x:Key="AutomationDelegatingListViewStyle" />
<Thickness x:Key="labelPadding">0, 5, 0, 2</Thickness>
<Thickness x:Key="okCancelButtonPadding">9,2,9,2</Thickness>
<Thickness x:Key="selectDeselectButtonPadding">9,2,9,2</Thickness>
Expand Down Expand Up @@ -56,7 +63,8 @@
<GroupBox x:Uid="MemberSelectionGroupBox"
Margin="0, 9, 0, 0"
Grid.Row="1"
Header="{Binding ElementName=dialog, Path=PickMembersTitle}">
Header="{Binding ElementName=dialog, Path=PickMembersTitle}"
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.HeaderTextBrushKey}}">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a Theme color we should be using for the box Border?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to be automatically done with vs:ThemedDialogStyleLoader.UseDefaultThemedDialogStyles="True"

<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
Expand All @@ -74,7 +82,9 @@
SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
PreviewKeyDown="OnListViewPreviewKeyDown"
MouseDoubleClick="OnListViewDoubleClick"
ItemsSource="{Binding MemberContainers, Mode=TwoWay}">
ItemsSource="{Binding MemberContainers, Mode=TwoWay}"
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.ListBoxTextBrushKey}}">
<u:AutomationDelegatingListView.ItemTemplate x:Uid="SelectableMemberListItem">
<DataTemplate>
<StackPanel Orientation="Horizontal">
Expand All @@ -97,7 +107,7 @@

<StackPanel Grid.Column="1">

<vs:DialogButton Name="UpButton"
<Button Name="UpButton"
AutomationProperties.Name="{Binding MoveUpAutomationText}"
Margin="0 9 4 0"
IsEnabled="{Binding CanMoveUp, Mode=OneWay}"
Expand All @@ -107,10 +117,9 @@
<imaging:CrispImage Name="UpArrowImage"
Height="16"
Width="16"
Moniker="{x:Static imagecatalog:KnownMonikers.MoveUp}"
Grayscale="{Binding IsEnabled, ElementName=UpButton, Converter={StaticResource NegateBooleanConverter}}"/>
</vs:DialogButton>
<vs:DialogButton Name="DownButton"
Moniker="{x:Static imagecatalog:KnownMonikers.MoveUp}" />
</Button>
<Button Name="DownButton"
AutomationProperties.Name="{Binding MoveDownAutomationText}"
Margin="0 9 4 0"
IsEnabled="{Binding CanMoveDown, Mode=OneWay}"
Expand All @@ -120,10 +129,9 @@
<imaging:CrispImage Name="DownArrowImage"
Height="16"
Width="16"
Moniker="{x:Static imagecatalog:KnownMonikers.MoveDown}"
Grayscale="{Binding IsEnabled, ElementName=DownButton, Converter={StaticResource NegateBooleanConverter}}"/>
Moniker="{x:Static imagecatalog:KnownMonikers.MoveDown}" />

</vs:DialogButton>
</Button>

<Button x:Uid="SelectAllButton"
Content="{Binding ElementName=dialog, Path=SelectAll}"
Expand Down
4 changes: 2 additions & 2 deletions src/VisualStudio/Core/Def/PickMembers/PickMembersDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ public TestAccessor(PickMembersDialog dialog)

public Button CancelButton => _dialog.CancelButton;

public DialogButton UpButton => _dialog.UpButton;
public Button UpButton => _dialog.UpButton;

public DialogButton DownButton => _dialog.DownButton;
public Button DownButton => _dialog.DownButton;

public AutomationDelegatingListView Members => _dialog.Members;
}
Expand Down