Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Stedfast <jeff@xamarin.com>2013-08-13 02:04:16 +0400
committerJeffrey Stedfast <jeff@xamarin.com>2013-08-13 02:04:16 +0400
commit54a64a751b7070237368b7967cc4a6adff6bc468 (patch)
treeac65fc1be4ac731aeec1fe28c09d918c3a4a6473 /main/src/tools
parentd44c1229550441d9198217493b34f9eca9715557 (diff)
Revert "Fix hundreds of warnings"
This reverts commit 1db8e4676941210b5bf7c68e01f70e1b85cd2a41.
Diffstat (limited to 'main/src/tools')
-rw-r--r--main/src/tools/mdmonitor/TimeLineView.cs19
-rw-r--r--main/src/tools/mdmonitor/mdmonitor.csproj4
2 files changed, 9 insertions, 14 deletions
diff --git a/main/src/tools/mdmonitor/TimeLineView.cs b/main/src/tools/mdmonitor/TimeLineView.cs
index 84df68518f..500026198c 100644
--- a/main/src/tools/mdmonitor/TimeLineView.cs
+++ b/main/src/tools/mdmonitor/TimeLineView.cs
@@ -31,7 +31,6 @@ using System.Collections.Generic;
using MonoDevelop.Core.Instrumentation;
using MonoDevelop.Components;
using System.Linq;
-using Mono.TextEditor;
namespace Mono.Instrumentation.Monitor
{
@@ -368,9 +367,9 @@ namespace Mono.Instrumentation.Monitor
ctx.NewPath ();
ctx.Rectangle (markerX, ytop + baseTime + 0.5, MarkerWidth/2, ((mainValue.Duration.TotalMilliseconds * scale) / 1000));
- Mono.TextEditor.HslColor hsl = Style.Foreground (Gtk.StateType.Normal);
+ HslColor hsl = Style.Foreground (Gtk.StateType.Normal);
hsl.L = 0.8;
- ctx.SetSourceColor (hsl);
+ ctx.Color = hsl;
ctx.Fill ();
// Draw values
@@ -393,7 +392,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.SetSourceColor (Style.Foreground (Gtk.StateType.Normal).ToCairoColor ());
+ ctx.Color = Style.Foreground (Gtk.StateType.Normal).ToCairoColor ();
ctx.Stroke ();
y += 2;
@@ -465,9 +464,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));
- Mono.TextEditor.HslColor hsl = color;
+ HslColor hsl = color;
hsl.L = val == focusedValue ? 0.9 : 0.8;
- ctx.SetSourceColor (hsl);
+ ctx.Color = hsl;
ctx.Fill ();
}
@@ -477,7 +476,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.SetSourceColor (color.ToCairoColor ());
+ ctx.Color = color.ToCairoColor ();
ctx.Stroke ();
// Expander
@@ -523,11 +522,11 @@ namespace Mono.Instrumentation.Monitor
ctx.LineWidth = 1;
ctx.Rectangle (ex, ey, ExpanderSize, ExpanderSize);
if (hilight)
- ctx.SetSourceColor (Style.Background (Gtk.StateType.Normal).ToCairoColor ());
+ ctx.Color = Style.Background (Gtk.StateType.Normal).ToCairoColor ();
else
- ctx.SetSourceColor (Style.White.ToCairoColor ());
+ ctx.Color = Style.White.ToCairoColor ();
ctx.FillPreserve ();
- ctx.SetSourceColor (Style.Foreground (Gtk.StateType.Normal).ToCairoColor ());
+ ctx.Color = 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 c1371d5394..426652024f 100644
--- a/main/src/tools/mdmonitor/mdmonitor.csproj
+++ b/main/src/tools/mdmonitor/mdmonitor.csproj
@@ -93,10 +93,6 @@
<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>