diff options
author | Vsevolod Kukol <sevoku@microsoft.com> | 2018-04-12 11:37:18 +0300 |
---|---|---|
committer | Vsevolod Kukol <sevoku@microsoft.com> | 2018-04-12 11:37:18 +0300 |
commit | e4f22166cc3ef4ec88a9a406dec862f1b872dc32 (patch) | |
tree | df3de898a76418b87d1e01f73d158886b5d3bcde /main/src | |
parent | 9e546c520383b33c3348a546fced68459ba50f2b (diff) |
[Editor] Improve search results marker color
Use a default visible fallback color for search markers,
if the default highlight color is not bright enough.
Diffstat (limited to 'main/src')
-rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs | 3 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs index 6ee7b824f5..42b74cd5a1 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs @@ -901,6 +901,9 @@ namespace MonoDevelop.SourceEditor.QuickTasks void DrawSearchResults (Cairo.Context cr, IndicatorDrawingState state, int i) { var color = SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, EditorThemeColors.FindHighlight); + if (Math.Abs (HslColor.Brightness (color) - HslColor.Brightness (SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, EditorThemeColors.Background))) < 0.1) + color = Styles.Editor.SearchMarkerFallbackColor; + if (i == state.MainSelection) { // TODO: EditorTheme does that look ok ? if (HslColor.Brightness (color) < 0.5) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs index 6d72331346..eeca27c4d1 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs @@ -271,6 +271,7 @@ namespace MonoDevelop.Ide.Gui public static Color SmartTagMarkerColorLight { get; internal set; } public static Color SmartTagMarkerColorDark { get; internal set; } public static Color SearchErrorForegroundColor { get; internal set; } + public static Color SearchMarkerFallbackColor { get; internal set; } } public static class KeyBindingsPanel @@ -431,6 +432,8 @@ namespace MonoDevelop.Ide.Gui Editor.SmartTagMarkerColorLight = Color.FromName ("#ff70fe").WithAlpha (.5); Editor.SmartTagMarkerColorDark = Color.FromName ("#ffffff").WithAlpha (.5); Editor.SearchErrorForegroundColor = ErrorForegroundColor; + // TODO: FINAL COLOR! + Editor.SearchMarkerFallbackColor = Color.FromName ("#ff00ff"); // Key Bindings Preferences |