[TextEditor] Replaced old theme engine with new unified one.

3 files changed, 14 insertions, 12 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberReference.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberReference.cs
index 6501e434d2..4834d56979 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberReference.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberReference.cs
@@ -81,12 +81,13 @@ namespace MonoDevelop.Ide.FindInFiles
 			return ((IVariable)EntityOrVariable).Name;
 		}
 
-		public override AmbientColor GetBackgroundMarkerColor (ColorScheme style)
+		public override Components.HslColor GetBackgroundMarkerColor (EditorTheme style)
 		{
-			return (ReferenceUsageType & ReferenceUsageType.Write) != 0 ||
-				(ReferenceUsageType & ReferenceUsageType.Declariton) != 0?
-				style.ChangingUsagesRectangle :
-				style.UsagesRectangle;
+			var key = (ReferenceUsageType & ReferenceUsageType.Write) != 0 ||
+				(ReferenceUsageType & ReferenceUsageType.Declariton) != 0 ?
+				ThemeSettingColors.ChangingUsagesRectangle : ThemeSettingColors.UsagesRectangle;
+
+			return SyntaxModeService.GetColor (style, key);
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs
index 0c0265becd..e641efe5f2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs
@@ -77,9 +77,9 @@ namespace MonoDevelop.Ide.FindInFiles
 			return string.Format("[SearchResult: FileProvider={0}, Offset={1}, Length={2}]", FileProvider, Offset, Length);
 		}
 
-		public virtual AmbientColor GetBackgroundMarkerColor (ColorScheme style)
+		public virtual Components.HslColor GetBackgroundMarkerColor (EditorTheme style)
 		{
-			return style.SearchResult;
+			return SyntaxModeService.GetColor (style, ThemeSettingColors.FindHighlight);;
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
index 05ca19153a..d34b296d18 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
@@ -60,7 +60,7 @@ namespace MonoDevelop.Ide.FindInFiles
 		const int SearchResultColumn = 0;
 		const int DidReadColumn      = 1;
 		
-		ColorScheme highlightStyle;
+		EditorTheme highlightStyle;
 		
 		ScrolledWindow scrolledwindowLogView; 
 		PadTreeView treeviewSearchResults;
@@ -216,7 +216,7 @@ namespace MonoDevelop.Ide.FindInFiles
 
 		void UpdateStyles (object sender = null, EventArgs e = null)
 		{
-			highlightStyle = SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme);
+			highlightStyle = SyntaxModeService.GetEditorTheme (IdeApp.Preferences.ColorScheme);
 			if (!highlightStyle.FitsIdeTheme (IdeApp.Preferences.UserInterfaceTheme))
 				highlightStyle = SyntaxModeService.GetDefaultColorStyle (Ide.IdeApp.Preferences.UserInterfaceTheme);
 
@@ -598,12 +598,13 @@ namespace MonoDevelop.Ide.FindInFiles
 					textMarkup = markup;
 
 					if (!isSelected) {
-						var searchColor = searchResult.GetBackgroundMarkerColor (highlightStyle).Color;
+						var searchColor = searchResult.GetBackgroundMarkerColor (highlightStyle);
 						double b1 = HslColor.Brightness (searchColor);
-						double b2 = HslColor.Brightness (AdjustColor (Style.Base (StateType.Normal), (HslColor)highlightStyle.PlainText.Foreground));
+
+						double b2 = HslColor.Brightness (AdjustColor (Style.Base (StateType.Normal), SyntaxModeService.GetColor (highlightStyle, ThemeSettingColors.Foreground)));
 						double delta = Math.Abs (b1 - b2);
 						if (delta < 0.1) {
-							var color1 = highlightStyle.SearchResult.Color;
+							var color1 = SyntaxModeService.GetColor (highlightStyle, ThemeSettingColors.FindHighlight);
 							if (color1.L + 0.5 > 1.0) {
 								color1.L -= 0.5;
 							} else {