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

Fix #48: Icon color follows VSColorScheme #49

Merged
merged 1 commit into from
Nov 9, 2024
Merged

Fix #48: Icon color follows VSColorScheme #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
<PackageVersion Include="DataGridExtensions" Version="2.6.0" />
<PackageVersion Include="Fody" Version="6.8.2" />
<PackageVersion Include="Microsoft.Build" Version="[17.4.0]" Justification="VSIX limitation"/>
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="[17.4.0]" Justification="VSIX limitation"/>
<PackageVersion Include="Microsoft.Build" Version="[17.4.0]" Justification="VSIX limitation" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="[17.4.0]" Justification="VSIX limitation" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.12.2069" />
<PackageVersion Include="NuGet.Protocol" Version="[6.5.1]" Justification="VSIX limitation (Newtonsoft.Json 13.0.1)" />
<PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
<PackageVersion Include="Throttle.Fody" Version="1.7.0" />
<PackageVersion Include="TomsToolbox.Essentials" Version="2.20.0" />
<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.20.0" />
<PackageVersion Include="TomsToolbox.Essentials" Version="2.21.0" />
<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.21.0" />
<PackageVersion Include="VSIX-SdkProjectAdapter" Version="3.0.0" />
</ItemGroup>

Expand Down
14 changes: 11 additions & 3 deletions src/NuGetMonitor/Resources/VSColorScheme.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:platformUi="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Imaging"
xmlns:styles="urn:TomsToolbox.Wpf.Styles">

<SolidColorBrush x:Key="{x:Static SystemColors.ControlLightLightBrushKey}"
Expand Down Expand Up @@ -60,7 +61,14 @@
<SolidColorBrush x:Key="{x:Static styles:ResourceKeys.DisabledBrush}"
Color="{DynamicResource {x:Static vsfx:VsColors.ComboBoxDisabledBackgroundKey}}" />

<SolidColorBrush x:Key="CommandBarToolBarBorderBrush"
Color="{DynamicResource {x:Static vsfx:VsColors.CommandBarToolBarBorderKey}}" />

<Style TargetType="ToolBar" BasedOn="{StaticResource {x:Static styles:ResourceKeys.ToolBarStyle}}">
<Setter Property="Background" Value="{DynamicResource {x:Static vsfx:VsBrushes.CommandBarToolBarBorderKey}}" />
<Setter Property="platformUi:ImageThemingUtilities.ImageBackgroundColor" Value="{DynamicResource {x:Static vsfx:VsColors.WindowKey}}" />
</Style>

<Style TargetType="ContextMenu" BasedOn="{StaticResource {x:Static styles:ResourceKeys.ContextMenuStyle}}">
<Setter Property="Background" Value="{DynamicResource {x:Static vsfx:VsBrushes.CommandBarMenuIconBackgroundKey}}" />
<Setter Property="platformUi:ImageThemingUtilities.ImageBackgroundColor" Value="{DynamicResource {x:Static vsfx:VsColors.WindowKey}}" />
</Style>

</ResourceDictionary>
6 changes: 2 additions & 4 deletions src/NuGetMonitor/View/DependencyTree/DependencyTreeControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<Setter Property="IsExpanded" Value="False" />
</Style>
<ContextMenu x:Key="PackageContextMenu"
d:DataContext="{d:DesignInstance local:ChildNode}"
Style="{DynamicResource {x:Static styles:ResourceKeys.ContextMenuStyle}}">
d:DataContext="{d:DesignInstance local:ChildNode}">
<MenuItem Header="Copy PackageReference"
Command="{Binding CopyPackageReferenceCommand}">
<MenuItem.Icon>
Expand Down Expand Up @@ -110,8 +109,7 @@
</UserControl.Resources>
<Grid FocusManager.FocusedElement="{Binding ElementName=TreeView}">
<DockPanel>
<ToolBar DockPanel.Dock="Top"
Style="{DynamicResource {x:Static styles:ResourceKeys.ToolBarStyle}}">
<ToolBar DockPanel.Dock="Top">
<Button Command="{Binding RefreshCommand}" ToolTip="Refresh">
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static imageCatalog:KnownMonikers.Refresh}" />
</Button>
Expand Down
4 changes: 1 addition & 3 deletions src/NuGetMonitor/View/Monitor/NuGetMonitorControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
</UserControl.Resources>
<Grid FocusManager.FocusedElement="{Binding ElementName=DataGrid}">
<DockPanel>
<ToolBar DockPanel.Dock="Top" Style="{DynamicResource {x:Static styles:ResourceKeys.ToolBarStyle}}"
Background="{StaticResource CommandBarToolBarBorderBrush}">
<ToolBar DockPanel.Dock="Top">
<Button Command="{Binding UpdateSelectedCommand}"
ToolTip="Update Selected Items">
<Grid Width="16" Height="16"
Expand Down Expand Up @@ -235,7 +234,6 @@
dgx:DataGridFilterColumn.IsFilterVisible="False" />
</DataGrid.Columns>
</DataGrid>

</DockPanel>
<toms:LoadingIndicator IsActive="{Binding IsLoading}" Header="Loading..." d:IsHidden="True"/>
</Grid>
Expand Down