diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2013-08-11 23:57:50 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2013-08-12 19:57:27 +0400 |
| commit | 1db8e4676941210b5bf7c68e01f70e1b85cd2a41 (patch) | |
| tree | d95e2ceba188cd523ad727cf91a902ac70e8f294 /main/src/tools | |
| parent | 199784c53c8290354427519ada56aebee71d1ed1 (diff) | |
Fix hundreds of warnings
Diffstat (limited to 'main/src/tools')
| -rw-r--r-- | main/src/tools/mdmonitor/TimeLineView.cs | 19 | ||||
| -rw-r--r-- | main/src/tools/mdmonitor/mdmonitor.csproj | 4 |
2 files changed, 14 insertions, 9 deletions
diff --git a/main/src/tools/mdmonitor/TimeLineView.cs b/main/src/tools/mdmonitor/TimeLineView.cs index 500026198c..84df68518f 100644 --- a/main/src/tools/mdmonitor/TimeLineView.cs +++ b/main/src/tools/mdmonitor/TimeLineView.cs @@ -31,6 +31,7 @@ using System.Collections.Generic; using MonoDevelop.Core.Instrumentation; using MonoDevelop.Components; using System.Linq; +using Mono.TextEditor; namespace Mono.Instrumentation.Monitor { @@ -367,9 +368,9 @@ namespace Mono.Instrumentation.Monitor ctx.NewPath (); ctx.Rectangle (markerX, ytop + baseTime + 0.5, MarkerWidth/2, ((mainValue.Duration.TotalMilliseconds * scale) / 1000)); - HslColor hsl = Style.Foreground (Gtk.StateType.Normal); + Mono.TextEditor.HslColor hsl = Style.Foreground (Gtk.StateType.Normal); hsl.L = 0.8; - ctx.Color = hsl; + ctx.SetSourceColor (hsl); ctx.Fill (); // Draw values @@ -392,7 +393,7 @@ namespace Mono.Instrumentation.Monitor int y = ytop + (int) (n * scale) + baseTime; ctx.MoveTo (markerX, y + 0.5); ctx.LineTo (markerX + MarkerWidth, y + 0.5); - ctx.Color = Style.Foreground (Gtk.StateType.Normal).ToCairoColor (); + ctx.SetSourceColor (Style.Foreground (Gtk.StateType.Normal).ToCairoColor ()); ctx.Stroke (); y += 2; @@ -464,9 +465,9 @@ namespace Mono.Instrumentation.Monitor ctx.NewPath (); double dx = val == focusedValue ? 0 : 2; ctx.Rectangle (lx + 0.5 + dx - SelectedValuePadding, ytime + 0.5, LineEndWidth - dx*2 + SelectedValuePadding, ((val.Duration.TotalMilliseconds * scale) / 1000)); - HslColor hsl = color; + Mono.TextEditor.HslColor hsl = color; hsl.L = val == focusedValue ? 0.9 : 0.8; - ctx.Color = hsl; + ctx.SetSourceColor (hsl); ctx.Fill (); } @@ -476,7 +477,7 @@ namespace Mono.Instrumentation.Monitor ctx.LineTo (lx + LineEndWidth + 0.5, ytime + 0.5); ctx.LineTo (tx - 3 - LineEndWidth + 0.5, ty + (th / 2) + 0.5); ctx.LineTo (tx + indent - 3 + 0.5, ty + (th / 2) + 0.5); - ctx.Color = color.ToCairoColor (); + ctx.SetSourceColor (color.ToCairoColor ()); ctx.Stroke (); // Expander @@ -522,11 +523,11 @@ namespace Mono.Instrumentation.Monitor ctx.LineWidth = 1; ctx.Rectangle (ex, ey, ExpanderSize, ExpanderSize); if (hilight) - ctx.Color = Style.Background (Gtk.StateType.Normal).ToCairoColor (); + ctx.SetSourceColor (Style.Background (Gtk.StateType.Normal).ToCairoColor ()); else - ctx.Color = Style.White.ToCairoColor (); + ctx.SetSourceColor (Style.White.ToCairoColor ()); ctx.FillPreserve (); - ctx.Color = Style.Foreground (Gtk.StateType.Normal).ToCairoColor (); + ctx.SetSourceColor (Style.Foreground (Gtk.StateType.Normal).ToCairoColor ()); ctx.Stroke (); ctx.NewPath (); ctx.MoveTo (ex + 2, ey + (ExpanderSize/2)); diff --git a/main/src/tools/mdmonitor/mdmonitor.csproj b/main/src/tools/mdmonitor/mdmonitor.csproj index 426652024f..c1371d5394 100644 --- a/main/src/tools/mdmonitor/mdmonitor.csproj +++ b/main/src/tools/mdmonitor/mdmonitor.csproj @@ -93,6 +93,10 @@ <Name>MonoDevelop.Ide</Name> <Private>False</Private> </ProjectReference> + <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj"> + <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project> + <Name>Mono.TextEditor</Name> + </ProjectReference> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> |