-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #56045 from jasonmalinowski/fix-editorfeatures.wpf…
…-layering Don't reference VS Shell binaries in EditorFeatures.Wpf
- Loading branch information
Showing
9 changed files
with
95 additions
and
38 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardColors.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename | ||
| { | ||
| internal static class DashboardColors | ||
| { | ||
| // In the Dashboard XAML, we bind to these keys to provide the correct color resources. | ||
| // The default values of these fields match the names of the keys in DashboardColors.xaml, | ||
| // but in Visual Studio we will change these keys (since they are settable) to the keys for | ||
| // the actual Visual Studio resource keys. | ||
| // | ||
| // Each entry here should have a corresponding entry in DashboardColors.xaml to specify the | ||
| // default color. | ||
|
|
||
| public static object SystemCaptionTextColorKey { get; set; } = "SystemCaptionTextColor"; | ||
| public static object SystemCaptionTextBrushKey { get; set; } = "SystemCaptionTextBrush"; | ||
| public static object CheckBoxTextBrushKey { get; set; } = "CheckBoxTextBrush"; | ||
| public static object BackgroundBrushKey { get; set; } = "BackgroundBrush"; | ||
| public static object AccentBarColorKey { get; set; } = "AccentBarBrush"; | ||
| public static object ButtonStyleKey { get; set; } = "ButtonStyle"; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/IDashboardColorUpdater.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename | ||
| { | ||
| internal interface IDashboardColorUpdater | ||
| { | ||
| /// <summary> | ||
| /// Implemented by a host to set the properties on <see cref="DashboardColors"/>. | ||
| /// </summary> | ||
| public void UpdateColors(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
src/VisualStudio/Core/Def/Implementation/InlineRename/DashboardColorUpdater.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System; | ||
| using System.ComponentModel.Composition; | ||
| using Microsoft.CodeAnalysis.Editor.Implementation.InlineRename; | ||
| using Microsoft.CodeAnalysis.Host.Mef; | ||
| using Microsoft.VisualStudio.PlatformUI; | ||
| using Microsoft.VisualStudio.Shell; | ||
|
|
||
| namespace Microsoft.VisualStudio.LanguageServices.Implementation.InlineRename | ||
| { | ||
| [Export(typeof(IDashboardColorUpdater))] | ||
| internal class DashboardColorUpdater : IDashboardColorUpdater | ||
| { | ||
| [ImportingConstructor] | ||
| [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] | ||
| public DashboardColorUpdater() | ||
| { | ||
| } | ||
|
|
||
| public void UpdateColors() | ||
| { | ||
| DashboardColors.SystemCaptionTextColorKey = EnvironmentColors.SystemWindowTextColorKey; | ||
| DashboardColors.SystemCaptionTextBrushKey = EnvironmentColors.SystemWindowTextBrushKey; | ||
| DashboardColors.CheckBoxTextBrushKey = EnvironmentColors.SystemWindowTextBrushKey; | ||
| DashboardColors.BackgroundBrushKey = VsBrushes.CommandBarGradientBeginKey; | ||
| DashboardColors.AccentBarColorKey = EnvironmentColors.FileTabInactiveDocumentBorderEdgeBrushKey; | ||
| DashboardColors.ButtonStyleKey = VsResourceKeys.ButtonStyleKey; | ||
| } | ||
| } | ||
| } |