diff options
| author | Vsevolod Kukol <sevoku@microsoft.com> | 2018-04-12 14:01:03 +0300 |
|---|---|---|
| committer | Vsevolod Kukol <sevoku@microsoft.com> | 2018-04-12 14:01:03 +0300 |
| commit | 330e8f45ee77636e0625a5d88aa56abe945dd1e8 (patch) | |
| tree | 2f86d7434abfa1321fa7f13b8ade19d7deeef564 | |
| parent | f85c66c14729aa9301e54906d8d82ef53a3cb016 (diff) | |
[Editor] Fix selected search result marker color
| -rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs | 15 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs | 3 |
2 files changed, 7 insertions, 11 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 42b74cd5a1..aba38914eb 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs @@ -900,18 +900,11 @@ namespace MonoDevelop.SourceEditor.QuickTasks void DrawSearchResults (Cairo.Context cr, IndicatorDrawingState state, int i) { - var color = SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, EditorThemeColors.FindHighlight); + bool isSelected = i == state.MainSelection; + var color = SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, isSelected ? EditorThemeColors.Selection : 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) { - color = color.AddLight (0.1); - } else { - color = color.AddLight (-0.1); - } - } + color = isSelected ? Styles.Editor.SearchMarkerSelectedFallbackColor : Styles.Editor.SearchMarkerFallbackColor; + cr.SetSourceColor (color); cr.Rectangle (barPadding, state.SearchResultIndicators[i], Allocation.Width - barPadding * 2, 2); cr.Fill (); 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 c7ad379822..97c9acf0ef 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs @@ -272,6 +272,7 @@ namespace MonoDevelop.Ide.Gui public static Color SmartTagMarkerColorDark { get; internal set; } public static Color SearchErrorForegroundColor { get; internal set; } public static Color SearchMarkerFallbackColor { get; internal set; } + public static Color SearchMarkerSelectedFallbackColor { get; internal set; } } public static class KeyBindingsPanel @@ -433,6 +434,8 @@ namespace MonoDevelop.Ide.Gui Editor.SmartTagMarkerColorDark = Color.FromName ("#ffffff").WithAlpha (.5); Editor.SearchErrorForegroundColor = ErrorForegroundColor; Editor.SearchMarkerFallbackColor = Color.FromName ("#f3da2d"); + // TODO: FINAL COLOR! + Editor.SearchMarkerSelectedFallbackColor = Color.FromName ("#ff00ff"); // Key Bindings Preferences |