-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Don't reference VS Shell binaries in EditorFeatures.Wpf #56045
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.
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
Merged
jasonmalinowski
merged 2 commits into
dotnet:main
from
jasonmalinowski:fix-editorfeatures.wpf-layering
Sep 3, 2021
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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; | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this work with theme updates after opening?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, since the thing we're passing around here is the keys, not the colors/brushes themselves. Turns out that's what makes the other approaches difficult -- it's not just the values that are dynamic, but the keys themselves.