From 5cd95557bbf6a7cd6fe85b4e3f49319a2c3983b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Sat, 22 Dec 2018 11:48:58 +0100 Subject: [PATCH] MDCrow, single treaded xlib with discard event on xsync --- Crow.sln | 6 + Crow/Templates/Button.template | 2 +- Crow/src/BmpPicture.cs | 2 +- Crow/src/Cairo/CairoHelpers.cs | 12 +- Crow/src/ExtensionsMethods.cs | 62 ++--- Crow/src/Fill/Fill.cs | 2 +- Crow/src/Font.cs | 2 +- Crow/src/Gradient.cs | 10 +- Crow/src/GraphicObjects/Border.cs | 2 +- Crow/src/GraphicObjects/Button.cs | 2 +- Crow/src/GraphicObjects/DockStack.cs | 2 +- Crow/src/GraphicObjects/GraduatedSlider.cs | 2 +- Crow/src/GraphicObjects/Group.cs | 2 +- Crow/src/GraphicObjects/HueSelector.cs | 2 +- Crow/src/GraphicObjects/Image.cs | 2 +- Crow/src/GraphicObjects/Label.cs | 6 +- Crow/src/GraphicObjects/PrivateContainer.cs | 2 +- Crow/src/GraphicObjects/ProgressBar.cs | 2 +- .../GraphicObjects/SaturationValueSelector.cs | 2 +- Crow/src/GraphicObjects/Scroller.cs | 2 +- Crow/src/GraphicObjects/ScrollingObject.cs | 2 +- Crow/src/GraphicObjects/Shape.cs | 2 +- Crow/src/GraphicObjects/Slider.cs | 2 +- Crow/src/GraphicObjects/Splitter.cs | 6 +- Crow/src/GraphicObjects/TabItem.cs | 2 +- Crow/src/GraphicObjects/TabView.cs | 2 +- Crow/src/GraphicObjects/TemplatedControl.cs | 2 +- Crow/src/GraphicObjects/TestCairoPatch.cs | 2 +- Crow/src/GraphicObjects/TextBox.cs | 2 +- Crow/src/GraphicObjects/TextRun.cs | 2 +- Crow/src/GraphicObjects/Trend.cs | 2 +- Crow/src/GraphicObjects/Widget.cs | 4 +- Crow/src/GraphicObjects/Window.cs | 24 +- Crow/src/Interface.cs | 18 +- Crow/src/Mono.Cairo/Antialias.cs | 2 +- Crow/src/Mono.Cairo/Cairo.cs | 6 +- Crow/src/Mono.Cairo/CairoDebug.cs | 2 +- Crow/src/Mono.Cairo/Content.cs | 2 +- Crow/src/Mono.Cairo/Context.cs | 16 +- Crow/src/Mono.Cairo/DRMDevice.cs | 2 +- Crow/src/Mono.Cairo/DRMSurface.cs | 2 +- Crow/src/Mono.Cairo/Device.cs | 2 +- Crow/src/Mono.Cairo/DirectFBSurface.cs | 2 +- Crow/src/Mono.Cairo/Distance.cs | 2 +- Crow/src/Mono.Cairo/EGLDevice.cs | 2 +- Crow/src/Mono.Cairo/Extend.cs | 2 +- Crow/src/Mono.Cairo/FillRule.cs | 2 +- Crow/src/Mono.Cairo/Filter.cs | 2 +- Crow/src/Mono.Cairo/FontExtents.cs | 2 +- Crow/src/Mono.Cairo/FontFace.cs | 2 +- Crow/src/Mono.Cairo/FontOptions.cs | 2 +- Crow/src/Mono.Cairo/FontSlant.cs | 2 +- Crow/src/Mono.Cairo/FontType.cs | 2 +- Crow/src/Mono.Cairo/FontWeight.cs | 2 +- Crow/src/Mono.Cairo/Format.cs | 2 +- Crow/src/Mono.Cairo/GLSurface.cs | 4 +- Crow/src/Mono.Cairo/GLXDevice.cs | 2 +- Crow/src/Mono.Cairo/GlitzSurface.cs | 2 +- Crow/src/Mono.Cairo/Glyph.cs | 2 +- Crow/src/Mono.Cairo/Gradient.cs | 2 +- Crow/src/Mono.Cairo/HintMetrics.cs | 2 +- Crow/src/Mono.Cairo/HintStyle.cs | 2 +- Crow/src/Mono.Cairo/ImageSurface.cs | 4 +- Crow/src/Mono.Cairo/LineCap.cs | 2 +- Crow/src/Mono.Cairo/LineJoin.cs | 2 +- Crow/src/Mono.Cairo/LinearGradient.cs | 2 +- Crow/src/Mono.Cairo/Matrix.cs | 4 +- Crow/src/Mono.Cairo/MeshPattern.cs | 2 +- Crow/src/Mono.Cairo/NativeMethods.cs | 14 +- Crow/src/Mono.Cairo/Operator.cs | 2 +- Crow/src/Mono.Cairo/PSSurface.cs | 2 +- Crow/src/Mono.Cairo/Path.cs | 4 +- Crow/src/Mono.Cairo/Pattern.cs | 2 +- Crow/src/Mono.Cairo/PatternType.cs | 2 +- Crow/src/Mono.Cairo/PdfSurface.cs | 2 +- Crow/src/Mono.Cairo/Point.cs | 2 +- Crow/src/Mono.Cairo/PointD.cs | 2 +- Crow/src/Mono.Cairo/RadialGradient.cs | 2 +- Crow/src/Mono.Cairo/Region.cs | 2 +- Crow/src/Mono.Cairo/ScaledFont.cs | 2 +- Crow/src/Mono.Cairo/SolidPattern.cs | 2 +- Crow/src/Mono.Cairo/Status.cs | 2 +- Crow/src/Mono.Cairo/SubpixelOrder.cs | 2 +- Crow/src/Mono.Cairo/Surface.cs | 18 +- Crow/src/Mono.Cairo/SurfacePattern.cs | 2 +- Crow/src/Mono.Cairo/SurfaceType.cs | 2 +- Crow/src/Mono.Cairo/SvgSurface.cs | 2 +- Crow/src/Mono.Cairo/SvgVersion.cs | 2 +- Crow/src/Mono.Cairo/TextExtents.cs | 2 +- Crow/src/Mono.Cairo/WGLDevice.cs | 2 +- Crow/src/Mono.Cairo/Win32Surface.cs | 2 +- Crow/src/Mono.Cairo/XcbSurface.cs | 2 +- Crow/src/Mono.Cairo/XlibSurface.cs | 2 +- Crow/src/Picture.cs | 2 +- Crow/src/Point.cs | 8 +- Crow/src/SolidColor.cs | 2 +- Crow/src/SvgPicture.cs | 2 +- Crow/src/backends/IBackend.cs | 19 ++ Crow/src/backends/win32/WinBackend.cs | 13 +- Crow/src/backends/xcb/XCBBackend.cs | 11 +- Crow/src/backends/xlib/XLibBackend.cs | 97 ++++++-- Crow/src/debug/DbgEventTypeColors.cs | 2 +- Crow/src/debug/DbgLogViewer.cs | 2 +- Crow/src/debug/DebugLogger.cs | 2 +- Crow/src/rsvg/Handle.cs | 4 +- CrowIDE/src/DesignInterface.cs | 2 +- CrowIDE/src/Editors/CodeBuffer/TextEditor.cs | 6 +- CrowIDE/src/Editors/ImlVisualEditor.cs | 12 +- CrowIDE/src/Editors/SourceEditor.cs | 12 +- CrowIDE/src/Editors/SvgEditor.cs | 2 +- CrowIDE/src/GraphicObjectDesignContainer.cs | 2 +- CrowIDE/src/MemberView/MembersView.cs | 2 +- CrowIDE/src/VerticalLine.cs | 2 +- MDCrow/AddinInfo.cs | 44 ++++ MDCrow/MDCrow.addin.xml | 24 ++ MDCrow/MDCrow.csproj | 30 +++ MDCrow/obj/MDCrow.csproj.nuget.cache | 5 + MDCrow/obj/MDCrow.csproj.nuget.g.props | 18 ++ MDCrow/obj/MDCrow.csproj.nuget.g.targets | 9 + MDCrow/obj/project.assets.json | 111 +++++++++ MDCrow/src/CrowCanvas.cs | 48 ++++ MDCrow/src/CrowDisplayBinding.cs | 57 +++++ MDCrow/src/CrowView.cs | 64 ++++++ MDCrow/src/DesignInterface.cs | 212 ++++++++++++++++++ MDCrow/src/MDCrowNodeExtension.cs | 131 +++++++++++ Tests/BasicTests.cs | 5 +- Tests/GraphicObjects/ColorCircleSelector.cs | 2 +- Tests/GraphicObjects/HexaContainer.cs | 2 +- Tests/GraphicObjects/LaggingGraphicObject.cs | 2 +- Tests/GraphicObjects/SimpleGauge.cs | 2 +- Tests/GraphicObjects/TechBorder.cs | 4 +- Tests/Interfaces/GraphicObject/0.crow | 6 +- 132 files changed, 1098 insertions(+), 252 deletions(-) mode change 100755 => 100644 Crow/src/backends/win32/WinBackend.cs create mode 100644 MDCrow/AddinInfo.cs create mode 100644 MDCrow/MDCrow.addin.xml create mode 100644 MDCrow/MDCrow.csproj create mode 100644 MDCrow/obj/MDCrow.csproj.nuget.cache create mode 100644 MDCrow/obj/MDCrow.csproj.nuget.g.props create mode 100644 MDCrow/obj/MDCrow.csproj.nuget.g.targets create mode 100644 MDCrow/obj/project.assets.json create mode 100644 MDCrow/src/CrowCanvas.cs create mode 100644 MDCrow/src/CrowDisplayBinding.cs create mode 100644 MDCrow/src/CrowView.cs create mode 100644 MDCrow/src/DesignInterface.cs create mode 100644 MDCrow/src/MDCrowNodeExtension.cs diff --git a/Crow.sln b/Crow.sln index 68347c39..b9be25c4 100644 --- a/Crow.sln +++ b/Crow.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrowIDE", "CrowIDE\CrowIDE.csproj", "{B6D911CD-1D09-42FC-B300-9187190F2AE1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MDCrow", "MDCrow\MDCrow.csproj", "{34956F17-5485-4C5C-9E2D-8EB15E5160AE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -25,6 +27,10 @@ Global {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Any CPU.Build.0 = Release|Any CPU + {34956F17-5485-4C5C-9E2D-8EB15E5160AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34956F17-5485-4C5C-9E2D-8EB15E5160AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34956F17-5485-4C5C-9E2D-8EB15E5160AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34956F17-5485-4C5C-9E2D-8EB15E5160AE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 diff --git a/Crow/Templates/Button.template b/Crow/Templates/Button.template index d2f6c602..db8c31e5 100755 --- a/Crow/Templates/Button.template +++ b/Crow/Templates/Button.template @@ -1,5 +1,5 @@ - 0) CairoHelpers.DrawRoundedRectangle (gr, r, radius, stroke); else gr.Rectangle (r, stroke); } - public static void CairoCircle(Cairo.Context gr, Rectangle r) + public static void CairoCircle(Crow.Cairo.Context gr, Rectangle r) { gr.Arc(r.X + r.Width/2, r.Y + r.Height/2, Math.Min(r.Width,r.Height)/2, 0, 2*Math.PI); } - public static void DrawRoundedRectangle(Cairo.Context gr, Rectangle r, double radius, double stroke = 0.0) + public static void DrawRoundedRectangle(Crow.Cairo.Context gr, Rectangle r, double radius, double stroke = 0.0) { if (stroke>0.0) { gr.LineWidth = stroke; @@ -78,7 +78,7 @@ namespace Crow }else DrawRoundedRectangle(gr, r.X, r.Y, r.Width, r.Height, radius); } - public static void DrawRoundedRectangle(Cairo.Context gr, double x, double y, double width, double height, double radius) + public static void DrawRoundedRectangle(Crow.Cairo.Context gr, double x, double y, double width, double height, double radius) { gr.Save(); @@ -96,7 +96,7 @@ namespace Crow gr.ClosePath(); gr.Restore(); } - public static void StrokeRaisedRectangle(Cairo.Context gr, Rectangle r, double width = 1) + public static void StrokeRaisedRectangle(Crow.Cairo.Context gr, Rectangle r, double width = 1) { gr.Save(); r.Inflate((int)-width / 2, (int)-width / 2); @@ -115,7 +115,7 @@ namespace Crow gr.Restore(); } - public static void StrokeLoweredRectangle(Cairo.Context gr, Rectangle r, double width = 1) + public static void StrokeLoweredRectangle(Crow.Cairo.Context gr, Rectangle r, double width = 1) { gr.Save(); r.Inflate((int)-width / 2, (int)-width / 2); diff --git a/Crow/src/ExtensionsMethods.cs b/Crow/src/ExtensionsMethods.cs index ecbc8a72..ef464270 100644 --- a/Crow/src/ExtensionsMethods.cs +++ b/Crow/src/ExtensionsMethods.cs @@ -33,7 +33,7 @@ namespace Crow { #region Cairo extensions - public static void Rectangle(this Cairo.Context ctx, Rectangle r, double stroke = 0.0) + public static void Rectangle(this Crow.Cairo.Context ctx, Rectangle r, double stroke = 0.0) { if (stroke > 0.0) { ctx.LineWidth = stroke; @@ -43,41 +43,41 @@ namespace Crow }else ctx.Rectangle (r.X, r.Y, r.Width, r.Height); } - public static double GetLength(this Cairo.PointD p){ + public static double GetLength(this Crow.Cairo.PointD p){ return Math.Sqrt (Math.Pow (p.X, 2) + Math.Pow (p.Y, 2)); } - public static Cairo.PointD GetPerp(this Cairo.PointD p){ - return new Cairo.PointD(-p.Y, p.X); + public static Crow.Cairo.PointD GetPerp(this Crow.Cairo.PointD p){ + return new Crow.Cairo.PointD(-p.Y, p.X); } - public static Cairo.PointD GetNormalized(this Cairo.PointD p){ + public static Crow.Cairo.PointD GetNormalized(this Crow.Cairo.PointD p){ double length = p.GetLength(); p.X /= length; p.Y /= length; return p; } - public static Cairo.PointD Substract(this Cairo.PointD p1, Cairo.PointD p2){ - return new Cairo.PointD(p1.X - p2.X, p1.Y - p2.Y); + public static Crow.Cairo.PointD Substract(this Crow.Cairo.PointD p1, Crow.Cairo.PointD p2){ + return new Crow.Cairo.PointD(p1.X - p2.X, p1.Y - p2.Y); } - public static Cairo.PointD Divide(this Cairo.PointD p1, double d){ - return new Cairo.PointD(p1.X / d, p1.Y / d); + public static Crow.Cairo.PointD Divide(this Crow.Cairo.PointD p1, double d){ + return new Crow.Cairo.PointD(p1.X / d, p1.Y / d); } - public static Cairo.PointD Add(this Cairo.PointD p1, Cairo.PointD p2){ - return new Cairo.PointD(p1.X + p2.X, p1.Y + p2.Y); + public static Crow.Cairo.PointD Add(this Crow.Cairo.PointD p1, Crow.Cairo.PointD p2){ + return new Crow.Cairo.PointD(p1.X + p2.X, p1.Y + p2.Y); } - public static Cairo.PointD Multiply(this Cairo.PointD p1, double v){ - return new Cairo.PointD(p1.X * v, p1.Y * v); + public static Crow.Cairo.PointD Multiply(this Crow.Cairo.PointD p1, double v){ + return new Crow.Cairo.PointD(p1.X * v, p1.Y * v); } - public static void DrawCote(this Cairo.Context ctx, Cairo.PointD p1, Cairo.PointD p2, + public static void DrawCote(this Crow.Cairo.Context ctx, Crow.Cairo.PointD p1, Crow.Cairo.PointD p2, double stroke = 1.0, bool fill = false, double arrowWidth = 3.0, double arrowLength = 7.0) { - Cairo.PointD vDir = p2.Substract(p1); + Crow.Cairo.PointD vDir = p2.Substract(p1); vDir = vDir.GetNormalized (); - Cairo.PointD vPerp = vDir.GetPerp (); + Crow.Cairo.PointD vPerp = vDir.GetPerp (); - Cairo.PointD pA0 = p1.Add(vDir.Multiply(arrowLength)); - Cairo.PointD pA1 = p2.Substract(vDir.Multiply(arrowLength)); + Crow.Cairo.PointD pA0 = p1.Add(vDir.Multiply(arrowLength)); + Crow.Cairo.PointD pA1 = p2.Substract(vDir.Multiply(arrowLength)); - Cairo.PointD vA = vPerp.Multiply (arrowWidth); + Crow.Cairo.PointD vA = vPerp.Multiply (arrowWidth); ctx.MoveTo (p1); ctx.LineTo (pA0.Add (vA)); @@ -104,17 +104,17 @@ namespace Crow ctx.LineWidth = stroke; ctx.Stroke (); } - public static void DrawCoteInverse(this Cairo.Context ctx, Cairo.PointD p1, Cairo.PointD p2, + public static void DrawCoteInverse(this Crow.Cairo.Context ctx, Crow.Cairo.PointD p1, Crow.Cairo.PointD p2, double stroke = 1.0, bool fill = false, double arrowWidth = 3.0, double arrowLength = 7.0) { - Cairo.PointD vDir = p2.Substract(p1); + Crow.Cairo.PointD vDir = p2.Substract(p1); vDir = vDir.GetNormalized (); - Cairo.PointD vPerp = vDir.GetPerp (); + Crow.Cairo.PointD vPerp = vDir.GetPerp (); - Cairo.PointD pA0 = p1.Add(vDir.Multiply(arrowLength)); - Cairo.PointD pA1 = p2.Substract(vDir.Multiply(arrowLength)); + Crow.Cairo.PointD pA0 = p1.Add(vDir.Multiply(arrowLength)); + Crow.Cairo.PointD pA1 = p2.Substract(vDir.Multiply(arrowLength)); - Cairo.PointD vA = vPerp.Multiply (arrowWidth); + Crow.Cairo.PointD vA = vPerp.Multiply (arrowWidth); ctx.MoveTo (p1.Add (vA)); ctx.LineTo (pA0); @@ -136,13 +136,13 @@ namespace Crow ctx.LineWidth = stroke; ctx.Stroke (); } - public static void DrawCoteFixed(this Cairo.Context ctx, Cairo.PointD p1, Cairo.PointD p2, + public static void DrawCoteFixed(this Crow.Cairo.Context ctx, Crow.Cairo.PointD p1, Crow.Cairo.PointD p2, double stroke = 1.0, double coteWidth = 3.0) { - Cairo.PointD vDir = p2.Substract(p1); + Crow.Cairo.PointD vDir = p2.Substract(p1); vDir = vDir.GetNormalized (); - Cairo.PointD vPerp = vDir.GetPerp (); - Cairo.PointD vA = vPerp.Multiply (coteWidth); + Crow.Cairo.PointD vPerp = vDir.GetPerp (); + Crow.Cairo.PointD vA = vPerp.Multiply (coteWidth); ctx.MoveTo (p1.Add (vA)); ctx.LineTo (p1.Substract (vA)); @@ -154,11 +154,11 @@ namespace Crow ctx.Stroke (); } - public static void SetSourceColor(this Cairo.Context ctx, Color c) + public static void SetSourceColor(this Crow.Cairo.Context ctx, Color c) { ctx.SetSourceRGBA(c.R,c.G,c.B,c.A); } - public static void AddColorStop(this Cairo.Gradient grad, double offset, Color c) + public static void AddColorStop(this Crow.Cairo.Gradient grad, double offset, Color c) { grad.AddColorStop (offset, c); } diff --git a/Crow/src/Fill/Fill.cs b/Crow/src/Fill/Fill.cs index 0c0bdf5b..7d521045 100644 --- a/Crow/src/Fill/Fill.cs +++ b/Crow/src/Fill/Fill.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/Font.cs b/Crow/src/Font.cs index 16353d70..06df4a88 100644 --- a/Crow/src/Font.cs +++ b/Crow/src/Font.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/Gradient.cs b/Crow/src/Gradient.cs index 2630c42a..1e37fac3 100644 --- a/Crow/src/Gradient.cs +++ b/Crow/src/Gradient.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; -using Cairo; +using Crow.Cairo; namespace Crow { @@ -81,16 +81,16 @@ namespace Crow public override void SetAsSource (Context ctx, Rectangle bounds = default(Rectangle)) { - Cairo.Gradient grad = null; + Crow.Cairo.Gradient grad = null; switch (GradientType) { case Type.Vertical: - grad = new Cairo.LinearGradient (bounds.Left, bounds.Top, bounds.Left, bounds.Bottom); + grad = new Crow.Cairo.LinearGradient (bounds.Left, bounds.Top, bounds.Left, bounds.Bottom); break; case Type.Horizontal: - grad = new Cairo.LinearGradient (bounds.Left, bounds.Top, bounds.Right, bounds.Top); + grad = new Crow.Cairo.LinearGradient (bounds.Left, bounds.Top, bounds.Right, bounds.Top); break; case Type.Oblic: - grad = new Cairo.LinearGradient (bounds.Left, bounds.Top, bounds.Right, bounds.Bottom); + grad = new Crow.Cairo.LinearGradient (bounds.Left, bounds.Top, bounds.Right, bounds.Bottom); break; case Type.Radial: throw new NotImplementedException (); diff --git a/Crow/src/GraphicObjects/Border.cs b/Crow/src/GraphicObjects/Border.cs index 9379c26a..e5a16ec8 100644 --- a/Crow/src/GraphicObjects/Border.cs +++ b/Crow/src/GraphicObjects/Border.cs @@ -28,7 +28,7 @@ using System; using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/GraphicObjects/Button.cs b/Crow/src/GraphicObjects/Button.cs index 30612512..8b15c2ea 100644 --- a/Crow/src/GraphicObjects/Button.cs +++ b/Crow/src/GraphicObjects/Button.cs @@ -33,7 +33,7 @@ using System.Text; using System.Diagnostics; using System.Xml.Serialization; -using Cairo; +using Crow.Cairo; using System.ComponentModel; namespace Crow diff --git a/Crow/src/GraphicObjects/DockStack.cs b/Crow/src/GraphicObjects/DockStack.cs index a52c7f6e..ab86ae0b 100644 --- a/Crow/src/GraphicObjects/DockStack.cs +++ b/Crow/src/GraphicObjects/DockStack.cs @@ -189,7 +189,7 @@ namespace Crow RegisterForGraphicUpdate (); } - protected override void onDraw (Cairo.Context gr) + protected override void onDraw (Crow.Cairo.Context gr) { gr.Save (); diff --git a/Crow/src/GraphicObjects/GraduatedSlider.cs b/Crow/src/GraphicObjects/GraduatedSlider.cs index e1d4dd46..71bbff11 100644 --- a/Crow/src/GraphicObjects/GraduatedSlider.cs +++ b/Crow/src/GraphicObjects/GraduatedSlider.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Cairo; +using Crow.Cairo; using System.Xml.Serialization; namespace Crow diff --git a/Crow/src/GraphicObjects/Group.cs b/Crow/src/GraphicObjects/Group.cs index 26a5084d..a0ae35b2 100644 --- a/Crow/src/GraphicObjects/Group.cs +++ b/Crow/src/GraphicObjects/Group.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Xml.Serialization; -using Cairo; +using Crow.Cairo; using System.Diagnostics; using System.Reflection; using System.Threading; diff --git a/Crow/src/GraphicObjects/HueSelector.cs b/Crow/src/GraphicObjects/HueSelector.cs index d8218fee..e9a31dfb 100644 --- a/Crow/src/GraphicObjects/HueSelector.cs +++ b/Crow/src/GraphicObjects/HueSelector.cs @@ -27,7 +27,7 @@ using System; using System.Xml.Serialization; using System.ComponentModel; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/GraphicObjects/Image.cs b/Crow/src/GraphicObjects/Image.cs index 388abb1b..98f86e58 100644 --- a/Crow/src/GraphicObjects/Image.cs +++ b/Crow/src/GraphicObjects/Image.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; diff --git a/Crow/src/GraphicObjects/Label.cs b/Crow/src/GraphicObjects/Label.cs index b4b813c6..371e79ce 100644 --- a/Crow/src/GraphicObjects/Label.cs +++ b/Crow/src/GraphicObjects/Label.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Diagnostics; -using Cairo; +using Crow.Cairo; using System.Text.RegularExpressions; using System.Xml.Serialization; using System.ComponentModel; @@ -692,12 +692,12 @@ namespace Crow { base.onMouseEnter (sender, e); if (Selectable) - IFace.MouseCursor = XCursor.Text; + IFace.MouseCursor = MouseCursors.Text; } public override void onMouseLeave (object sender, MouseMoveEventArgs e) { base.onMouseLeave (sender, e); - IFace.MouseCursor = XCursor.Default; + IFace.MouseCursor = MouseCursors.Default; } protected override void onFocused (object sender, EventArgs e) { diff --git a/Crow/src/GraphicObjects/PrivateContainer.cs b/Crow/src/GraphicObjects/PrivateContainer.cs index 8b1650e5..1225cbb3 100644 --- a/Crow/src/GraphicObjects/PrivateContainer.cs +++ b/Crow/src/GraphicObjects/PrivateContainer.cs @@ -27,7 +27,7 @@ using System; using System.Xml.Serialization; using System.ComponentModel; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/GraphicObjects/ProgressBar.cs b/Crow/src/GraphicObjects/ProgressBar.cs index afaead9b..20fadadc 100644 --- a/Crow/src/GraphicObjects/ProgressBar.cs +++ b/Crow/src/GraphicObjects/ProgressBar.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Cairo; +using Crow.Cairo; using System.Diagnostics; using System.Xml.Serialization; using System.ComponentModel; diff --git a/Crow/src/GraphicObjects/SaturationValueSelector.cs b/Crow/src/GraphicObjects/SaturationValueSelector.cs index 5a25d6a2..535a90df 100644 --- a/Crow/src/GraphicObjects/SaturationValueSelector.cs +++ b/Crow/src/GraphicObjects/SaturationValueSelector.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; using System.Xml.Serialization; namespace Crow diff --git a/Crow/src/GraphicObjects/Scroller.cs b/Crow/src/GraphicObjects/Scroller.cs index 99500d89..b97009ba 100644 --- a/Crow/src/GraphicObjects/Scroller.cs +++ b/Crow/src/GraphicObjects/Scroller.cs @@ -28,7 +28,7 @@ using System; using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/GraphicObjects/ScrollingObject.cs b/Crow/src/GraphicObjects/ScrollingObject.cs index 0f694236..12804899 100644 --- a/Crow/src/GraphicObjects/ScrollingObject.cs +++ b/Crow/src/GraphicObjects/ScrollingObject.cs @@ -28,7 +28,7 @@ using System; using System.Xml.Serialization; using System.ComponentModel; using System.Collections; -using Cairo; +using Crow.Cairo; namespace Crow diff --git a/Crow/src/GraphicObjects/Shape.cs b/Crow/src/GraphicObjects/Shape.cs index ea0409b1..99678556 100644 --- a/Crow/src/GraphicObjects/Shape.cs +++ b/Crow/src/GraphicObjects/Shape.cs @@ -28,7 +28,7 @@ using System.Xml.Serialization; using System.ComponentModel; using System.IO; using System.Text; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/GraphicObjects/Slider.cs b/Crow/src/GraphicObjects/Slider.cs index 2db34f92..bd46b051 100644 --- a/Crow/src/GraphicObjects/Slider.cs +++ b/Crow/src/GraphicObjects/Slider.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; diff --git a/Crow/src/GraphicObjects/Splitter.cs b/Crow/src/GraphicObjects/Splitter.cs index e1f8e637..70c64510 100644 --- a/Crow/src/GraphicObjects/Splitter.cs +++ b/Crow/src/GraphicObjects/Splitter.cs @@ -91,14 +91,14 @@ namespace Crow { base.onMouseEnter (sender, e); if ((Parent as GenericStack).Orientation == Orientation.Horizontal) - IFace.MouseCursor = XCursor.H; + IFace.MouseCursor = MouseCursors.H; else - IFace.MouseCursor = XCursor.V; + IFace.MouseCursor = MouseCursors.V; } public override void onMouseLeave (object sender, MouseMoveEventArgs e) { base.onMouseLeave (sender, e); - IFace.MouseCursor = XCursor.Default; + IFace.backend.SetCursor (MouseCursors.Default); } public override void onMouseDown (object sender, MouseButtonEventArgs e) { diff --git a/Crow/src/GraphicObjects/TabItem.cs b/Crow/src/GraphicObjects/TabItem.cs index 4d9847c7..113a4399 100644 --- a/Crow/src/GraphicObjects/TabItem.cs +++ b/Crow/src/GraphicObjects/TabItem.cs @@ -28,7 +28,7 @@ using System; using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; -using Cairo; +using Crow.Cairo; using System.Linq; namespace Crow diff --git a/Crow/src/GraphicObjects/TabView.cs b/Crow/src/GraphicObjects/TabView.cs index 655732f1..550d60aa 100644 --- a/Crow/src/GraphicObjects/TabView.cs +++ b/Crow/src/GraphicObjects/TabView.cs @@ -27,7 +27,7 @@ using System; using System.Xml.Serialization; using System.ComponentModel; -using Cairo; +using Crow.Cairo; using System.Diagnostics; using System.Linq; diff --git a/Crow/src/GraphicObjects/TemplatedControl.cs b/Crow/src/GraphicObjects/TemplatedControl.cs index 2e36eac6..d93cf4c8 100644 --- a/Crow/src/GraphicObjects/TemplatedControl.cs +++ b/Crow/src/GraphicObjects/TemplatedControl.cs @@ -29,7 +29,7 @@ using System.ComponentModel; using System.IO; using System.Xml; using System.Reflection; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/GraphicObjects/TestCairoPatch.cs b/Crow/src/GraphicObjects/TestCairoPatch.cs index cd15adc5..dcfb584c 100644 --- a/Crow/src/GraphicObjects/TestCairoPatch.cs +++ b/Crow/src/GraphicObjects/TestCairoPatch.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/GraphicObjects/TextBox.cs b/Crow/src/GraphicObjects/TextBox.cs index 500a0a1a..71fd6205 100644 --- a/Crow/src/GraphicObjects/TextBox.cs +++ b/Crow/src/GraphicObjects/TextBox.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; using System.Diagnostics; using System.Xml.Serialization; diff --git a/Crow/src/GraphicObjects/TextRun.cs b/Crow/src/GraphicObjects/TextRun.cs index 2be1d628..8b20ddb7 100644 --- a/Crow/src/GraphicObjects/TextRun.cs +++ b/Crow/src/GraphicObjects/TextRun.cs @@ -29,7 +29,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Diagnostics; -using Cairo; +using Crow.Cairo; using System.Text.RegularExpressions; using System.Xml.Serialization; using System.ComponentModel; diff --git a/Crow/src/GraphicObjects/Trend.cs b/Crow/src/GraphicObjects/Trend.cs index 8fcd8830..b62fd2f2 100644 --- a/Crow/src/GraphicObjects/Trend.cs +++ b/Crow/src/GraphicObjects/Trend.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.Xml.Serialization; using System.ComponentModel; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/GraphicObjects/Widget.cs b/Crow/src/GraphicObjects/Widget.cs index ea076f82..d6ea2580 100644 --- a/Crow/src/GraphicObjects/Widget.cs +++ b/Crow/src/GraphicObjects/Widget.cs @@ -31,7 +31,7 @@ using System.Xml.Serialization; using System.Reflection; using System.Reflection.Emit; using System.Runtime.CompilerServices; -using Cairo; +using Crow.Cairo; using System.Diagnostics; using Crow.IML; using System.Threading; @@ -816,7 +816,7 @@ namespace Crow /// /// Font being used in many controls, it is defined in the base GraphicObject class. /// - [DesignCategory ("Appearance")][DefaultValue("sans, 10")] + [DesignCategory ("Appearance")][DefaultValue("sans, 12")] public virtual Font Font { get { return font; } set { diff --git a/Crow/src/GraphicObjects/Window.cs b/Crow/src/GraphicObjects/Window.cs index 6c8f005e..a1c0c13f 100644 --- a/Crow/src/GraphicObjects/Window.cs +++ b/Crow/src/GraphicObjects/Window.cs @@ -296,7 +296,7 @@ namespace Crow if (!hoverBorder) { currentDirection = Direction.None; - IFace.MouseCursor = XCursor.Default; + IFace.MouseCursor = MouseCursors.Default; return; } @@ -333,31 +333,31 @@ namespace Crow if (currentDirection != lastDir) { switch (currentDirection) { case Direction.None: - otkgw.MouseCursor = XCursor.Default; + otkgw.MouseCursor = MouseCursors.Default; break; case Direction.N: - otkgw.MouseCursor = XCursor.V; + otkgw.MouseCursor = MouseCursors.V; break; case Direction.S: - otkgw.MouseCursor = XCursor.V; + otkgw.MouseCursor = MouseCursors.V; break; case Direction.E: - otkgw.MouseCursor = XCursor.H; + otkgw.MouseCursor = MouseCursors.H; break; case Direction.W: - otkgw.MouseCursor = XCursor.H; + otkgw.MouseCursor = MouseCursors.H; break; case Direction.NW: - otkgw.MouseCursor = XCursor.NW; + otkgw.MouseCursor = MouseCursors.NW; break; case Direction.NE: - otkgw.MouseCursor = XCursor.NE; + otkgw.MouseCursor = MouseCursors.NE; break; case Direction.SW: - otkgw.MouseCursor = XCursor.SW; + otkgw.MouseCursor = MouseCursors.SW; break; case Direction.SE: - otkgw.MouseCursor = XCursor.SE; + otkgw.MouseCursor = MouseCursors.SE; break; } } @@ -423,7 +423,7 @@ namespace Crow { hoverBorder = false; currentDirection = Direction.None; - IFace.MouseCursor = XCursor.Default; + IFace.MouseCursor = MouseCursors.Default; } protected virtual void onBorderMouseEnter (object sender, MouseMoveEventArgs e) { @@ -433,7 +433,7 @@ namespace Crow protected void butQuitPress (object sender, MouseButtonEventArgs e) { - IFace.MouseCursor = XCursor.Default; + IFace.MouseCursor = MouseCursors.Default; close (); } diff --git a/Crow/src/Interface.cs b/Crow/src/Interface.cs index 9ba6462a..eb77adf8 100644 --- a/Crow/src/Interface.cs +++ b/Crow/src/Interface.cs @@ -32,7 +32,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Threading; -using Cairo; +using Crow.Cairo; using Crow.IML; @@ -118,7 +118,7 @@ namespace Crow protected bool running; protected virtual void InitBackend () { if (Environment.OSVersion.Platform == PlatformID.Unix) - backend = new Crow.XCB.XCBBackend(); + backend = new Crow.XLib.XLibBackend(); else backend = new Crow.Win32.Win32Backend(); @@ -130,14 +130,14 @@ namespace Crow running = true; - Thread t = new Thread (interfaceThread); + /*Thread t = new Thread (interfaceThread); t.IsBackground = true; - t.Start (); + t.Start ();*/ } public void Run () { while (running) { + Update (); ProcessEvents (); - Thread.Sleep(1); } } public void ProcessKeyPress (char c) @@ -999,16 +999,12 @@ namespace Crow } #region Mouse and Keyboard Handling - XCursor cursor = XCursor.Default; public MouseState Mouse; - public XCursor MouseCursor { + public MouseCursors MouseCursor { set { - if (value == cursor) - return; - cursor = value; - MouseCursorChanged.Raise (this,new MouseCursorChangedEventArgs(cursor)); + backend.SetCursor (value); } } /// Processes mouse move events from the root container, this function diff --git a/Crow/src/Mono.Cairo/Antialias.cs b/Crow/src/Mono.Cairo/Antialias.cs index 30c71c0f..64da6443 100644 --- a/Crow/src/Mono.Cairo/Antialias.cs +++ b/Crow/src/Mono.Cairo/Antialias.cs @@ -30,7 +30,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum Antialias diff --git a/Crow/src/Mono.Cairo/Cairo.cs b/Crow/src/Mono.Cairo/Cairo.cs index c0a5f2ab..6450f397 100644 --- a/Crow/src/Mono.Cairo/Cairo.cs +++ b/Crow/src/Mono.Cairo/Cairo.cs @@ -34,18 +34,18 @@ using System; using System.Runtime.InteropServices; -namespace Cairo +namespace Crow.Cairo { public static class CairoAPI { static public int Version { get { - return Cairo.NativeMethods.cairo_version (); + return Crow.Cairo.NativeMethods.cairo_version (); } } static public string VersionString { get { - IntPtr x = Cairo.NativeMethods.cairo_version_string (); + IntPtr x = Crow.Cairo.NativeMethods.cairo_version_string (); return Marshal.PtrToStringAnsi (x); } } diff --git a/Crow/src/Mono.Cairo/CairoDebug.cs b/Crow/src/Mono.Cairo/CairoDebug.cs index d694bbb5..faff9338 100644 --- a/Crow/src/Mono.Cairo/CairoDebug.cs +++ b/Crow/src/Mono.Cairo/CairoDebug.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { static class CairoDebug { diff --git a/Crow/src/Mono.Cairo/Content.cs b/Crow/src/Mono.Cairo/Content.cs index a45370ff..f14305a4 100644 --- a/Crow/src/Mono.Cairo/Content.cs +++ b/Crow/src/Mono.Cairo/Content.cs @@ -30,7 +30,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { //[Flags] diff --git a/Crow/src/Mono.Cairo/Context.cs b/Crow/src/Mono.Cairo/Context.cs index d428b42c..44e1b5eb 100644 --- a/Crow/src/Mono.Cairo/Context.cs +++ b/Crow/src/Mono.Cairo/Context.cs @@ -39,7 +39,7 @@ using System.Runtime.InteropServices; using System.Text; using Color = Crow.Color; -namespace Cairo { +namespace Crow.Cairo { [Obsolete ("Renamed Cairo.Context per suggestion from cairo binding guidelines.")] public class Graphics : Context { @@ -141,7 +141,7 @@ namespace Cairo { set { NativeMethods.cairo_set_antialias (handle, value); } } - public Cairo.Status Status { + public Crow.Cairo.Status Status { get { return NativeMethods.cairo_status (handle); } @@ -173,7 +173,7 @@ namespace Cairo { } } - public Cairo.FillRule FillRule { + public Crow.Cairo.FillRule FillRule { set { NativeMethods.cairo_set_fill_rule (handle, value); } @@ -193,7 +193,7 @@ namespace Cairo { } } - public Cairo.LineCap LineCap { + public Crow.Cairo.LineCap LineCap { set { NativeMethods.cairo_set_line_cap (handle, value); } @@ -203,7 +203,7 @@ namespace Cairo { } } - public Cairo.LineJoin LineJoin { + public Crow.Cairo.LineJoin LineJoin { set { NativeMethods.cairo_set_line_join (handle, value); } @@ -247,7 +247,7 @@ namespace Cairo { public Pattern GetSource () { var ptr = NativeMethods.cairo_get_source (handle); - return Cairo.Pattern.Lookup (ptr, false); + return Crow.Cairo.Pattern.Lookup (ptr, false); } public double MiterLimit { @@ -275,7 +275,7 @@ namespace Cairo { } [Obsolete ("Use GetTarget/SetTarget")] - public Cairo.Surface Target { + public Crow.Cairo.Surface Target { set { if (handle != IntPtr.Zero) NativeMethods.cairo_destroy (handle); @@ -819,7 +819,7 @@ namespace Cairo { public FontFace GetContextFontFace () { - return Cairo.FontFace.Lookup (NativeMethods.cairo_get_font_face (handle), false); + return Crow.Cairo.FontFace.Lookup (NativeMethods.cairo_get_font_face (handle), false); } public void SetContextFontFace (FontFace value) diff --git a/Crow/src/Mono.Cairo/DRMDevice.cs b/Crow/src/Mono.Cairo/DRMDevice.cs index a03195fb..05e142cb 100644 --- a/Crow/src/Mono.Cairo/DRMDevice.cs +++ b/Crow/src/Mono.Cairo/DRMDevice.cs @@ -29,7 +29,7 @@ // using System; -namespace Cairo +namespace Crow.Cairo { public class DRMDevice : Device { diff --git a/Crow/src/Mono.Cairo/DRMSurface.cs b/Crow/src/Mono.Cairo/DRMSurface.cs index 248541c7..f624967f 100644 --- a/Crow/src/Mono.Cairo/DRMSurface.cs +++ b/Crow/src/Mono.Cairo/DRMSurface.cs @@ -30,7 +30,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class DRMSurface : Surface { diff --git a/Crow/src/Mono.Cairo/Device.cs b/Crow/src/Mono.Cairo/Device.cs index a5452f9d..dc9910cb 100644 --- a/Crow/src/Mono.Cairo/Device.cs +++ b/Crow/src/Mono.Cairo/Device.cs @@ -29,7 +29,7 @@ // using System; -namespace Cairo +namespace Crow.Cairo { public class Device : IDisposable { diff --git a/Crow/src/Mono.Cairo/DirectFBSurface.cs b/Crow/src/Mono.Cairo/DirectFBSurface.cs index afa57b7d..64431574 100644 --- a/Crow/src/Mono.Cairo/DirectFBSurface.cs +++ b/Crow/src/Mono.Cairo/DirectFBSurface.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class DirectFBSurface : Surface { internal DirectFBSurface (IntPtr handle, bool owns) : base (handle, owns) diff --git a/Crow/src/Mono.Cairo/Distance.cs b/Crow/src/Mono.Cairo/Distance.cs index 7cba3729..d716ab1f 100644 --- a/Crow/src/Mono.Cairo/Distance.cs +++ b/Crow/src/Mono.Cairo/Distance.cs @@ -34,7 +34,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -namespace Cairo { +namespace Crow.Cairo { public struct Distance { diff --git a/Crow/src/Mono.Cairo/EGLDevice.cs b/Crow/src/Mono.Cairo/EGLDevice.cs index 45c988a3..44590c70 100644 --- a/Crow/src/Mono.Cairo/EGLDevice.cs +++ b/Crow/src/Mono.Cairo/EGLDevice.cs @@ -29,7 +29,7 @@ // using System; -namespace Cairo +namespace Crow.Cairo { public class EGLDevice : Device { diff --git a/Crow/src/Mono.Cairo/Extend.cs b/Crow/src/Mono.Cairo/Extend.cs index 1135c2ff..4af536dc 100644 --- a/Crow/src/Mono.Cairo/Extend.cs +++ b/Crow/src/Mono.Cairo/Extend.cs @@ -32,7 +32,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum Extend diff --git a/Crow/src/Mono.Cairo/FillRule.cs b/Crow/src/Mono.Cairo/FillRule.cs index 24cbfba2..80f61ed5 100644 --- a/Crow/src/Mono.Cairo/FillRule.cs +++ b/Crow/src/Mono.Cairo/FillRule.cs @@ -30,7 +30,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum FillRule diff --git a/Crow/src/Mono.Cairo/Filter.cs b/Crow/src/Mono.Cairo/Filter.cs index 2355fbb3..a73ea58d 100644 --- a/Crow/src/Mono.Cairo/Filter.cs +++ b/Crow/src/Mono.Cairo/Filter.cs @@ -30,7 +30,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum Filter diff --git a/Crow/src/Mono.Cairo/FontExtents.cs b/Crow/src/Mono.Cairo/FontExtents.cs index 76c7e658..ea26d9bb 100644 --- a/Crow/src/Mono.Cairo/FontExtents.cs +++ b/Crow/src/Mono.Cairo/FontExtents.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; -namespace Cairo +namespace Crow.Cairo { [StructLayout (LayoutKind.Sequential)] public struct FontExtents diff --git a/Crow/src/Mono.Cairo/FontFace.cs b/Crow/src/Mono.Cairo/FontFace.cs index 19d8163c..64c428e2 100644 --- a/Crow/src/Mono.Cairo/FontFace.cs +++ b/Crow/src/Mono.Cairo/FontFace.cs @@ -32,7 +32,7 @@ // using System; -namespace Cairo +namespace Crow.Cairo { public class FontFace : IDisposable { diff --git a/Crow/src/Mono.Cairo/FontOptions.cs b/Crow/src/Mono.Cairo/FontOptions.cs index 5269d54d..f90a3a4d 100644 --- a/Crow/src/Mono.Cairo/FontOptions.cs +++ b/Crow/src/Mono.Cairo/FontOptions.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public class FontOptions : IDisposable { diff --git a/Crow/src/Mono.Cairo/FontSlant.cs b/Crow/src/Mono.Cairo/FontSlant.cs index b7a5684c..b3d8a1a2 100644 --- a/Crow/src/Mono.Cairo/FontSlant.cs +++ b/Crow/src/Mono.Cairo/FontSlant.cs @@ -30,7 +30,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum FontSlant diff --git a/Crow/src/Mono.Cairo/FontType.cs b/Crow/src/Mono.Cairo/FontType.cs index e9fd263a..5db44d4e 100644 --- a/Crow/src/Mono.Cairo/FontType.cs +++ b/Crow/src/Mono.Cairo/FontType.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public enum FontType diff --git a/Crow/src/Mono.Cairo/FontWeight.cs b/Crow/src/Mono.Cairo/FontWeight.cs index 5b781095..0b8fc6a8 100644 --- a/Crow/src/Mono.Cairo/FontWeight.cs +++ b/Crow/src/Mono.Cairo/FontWeight.cs @@ -30,7 +30,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum FontWeight diff --git a/Crow/src/Mono.Cairo/Format.cs b/Crow/src/Mono.Cairo/Format.cs index 96e9a0f5..54c8be1e 100644 --- a/Crow/src/Mono.Cairo/Format.cs +++ b/Crow/src/Mono.Cairo/Format.cs @@ -29,7 +29,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum Format diff --git a/Crow/src/Mono.Cairo/GLSurface.cs b/Crow/src/Mono.Cairo/GLSurface.cs index 9486c9cd..179012a4 100644 --- a/Crow/src/Mono.Cairo/GLSurface.cs +++ b/Crow/src/Mono.Cairo/GLSurface.cs @@ -30,7 +30,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class GLSurface : Surface { @@ -38,7 +38,7 @@ namespace Cairo { public GLSurface (IntPtr ptr, bool own) : base (ptr, own) {} - public GLSurface (Device device, Cairo.Content content, uint tex, int width, int height) + public GLSurface (Device device, Crow.Cairo.Content content, uint tex, int width, int height) : base (NativeMethods.cairo_gl_surface_create_for_texture (device.Handle, (uint)content, tex, width, height), true) {} diff --git a/Crow/src/Mono.Cairo/GLXDevice.cs b/Crow/src/Mono.Cairo/GLXDevice.cs index 189872a2..00cbce1f 100644 --- a/Crow/src/Mono.Cairo/GLXDevice.cs +++ b/Crow/src/Mono.Cairo/GLXDevice.cs @@ -29,7 +29,7 @@ // using System; -namespace Cairo +namespace Crow.Cairo { public class GLXDevice : Device { diff --git a/Crow/src/Mono.Cairo/GlitzSurface.cs b/Crow/src/Mono.Cairo/GlitzSurface.cs index 6da1ac6a..4aa24983 100644 --- a/Crow/src/Mono.Cairo/GlitzSurface.cs +++ b/Crow/src/Mono.Cairo/GlitzSurface.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class GlitzSurface : Surface { internal GlitzSurface (IntPtr handle, bool owns) : base (handle, owns) diff --git a/Crow/src/Mono.Cairo/Glyph.cs b/Crow/src/Mono.Cairo/Glyph.cs index ec9c2ff3..ad511562 100644 --- a/Crow/src/Mono.Cairo/Glyph.cs +++ b/Crow/src/Mono.Cairo/Glyph.cs @@ -30,7 +30,7 @@ using System; using System.Runtime.InteropServices; -namespace Cairo +namespace Crow.Cairo { [StructLayout(LayoutKind.Sequential)] public struct Glyph diff --git a/Crow/src/Mono.Cairo/Gradient.cs b/Crow/src/Mono.Cairo/Gradient.cs index c7bc53c6..427cc053 100644 --- a/Crow/src/Mono.Cairo/Gradient.cs +++ b/Crow/src/Mono.Cairo/Gradient.cs @@ -29,7 +29,7 @@ using System; using Color = Crow.Color; -namespace Cairo { +namespace Crow.Cairo { public class Gradient : Pattern { diff --git a/Crow/src/Mono.Cairo/HintMetrics.cs b/Crow/src/Mono.Cairo/HintMetrics.cs index 3bf01d23..d830f3eb 100644 --- a/Crow/src/Mono.Cairo/HintMetrics.cs +++ b/Crow/src/Mono.Cairo/HintMetrics.cs @@ -29,7 +29,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum HintMetrics diff --git a/Crow/src/Mono.Cairo/HintStyle.cs b/Crow/src/Mono.Cairo/HintStyle.cs index b8cca974..343daf3e 100644 --- a/Crow/src/Mono.Cairo/HintStyle.cs +++ b/Crow/src/Mono.Cairo/HintStyle.cs @@ -29,7 +29,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum HintStyle diff --git a/Crow/src/Mono.Cairo/ImageSurface.cs b/Crow/src/Mono.Cairo/ImageSurface.cs index 98143fe8..1737fe1a 100644 --- a/Crow/src/Mono.Cairo/ImageSurface.cs +++ b/Crow/src/Mono.Cairo/ImageSurface.cs @@ -35,7 +35,7 @@ using System; using System.Runtime.InteropServices; -namespace Cairo { +namespace Crow.Cairo { public class ImageSurface : Surface { @@ -49,7 +49,7 @@ namespace Cairo { } [Obsolete ("Use ImageSurface (byte[] data, Cairo.Format format, int width, int height, int stride)")] - public ImageSurface (ref byte[] data, Cairo.Format format, int width, int height, int stride) + public ImageSurface (ref byte[] data, Crow.Cairo.Format format, int width, int height, int stride) : this (data, format, width, height, stride) { } diff --git a/Crow/src/Mono.Cairo/LineCap.cs b/Crow/src/Mono.Cairo/LineCap.cs index 46938c25..1560cda4 100644 --- a/Crow/src/Mono.Cairo/LineCap.cs +++ b/Crow/src/Mono.Cairo/LineCap.cs @@ -29,7 +29,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum LineCap diff --git a/Crow/src/Mono.Cairo/LineJoin.cs b/Crow/src/Mono.Cairo/LineJoin.cs index b5c241b0..1d5389b5 100644 --- a/Crow/src/Mono.Cairo/LineJoin.cs +++ b/Crow/src/Mono.Cairo/LineJoin.cs @@ -29,7 +29,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum LineJoin diff --git a/Crow/src/Mono.Cairo/LinearGradient.cs b/Crow/src/Mono.Cairo/LinearGradient.cs index 85fdea84..100d1e6d 100644 --- a/Crow/src/Mono.Cairo/LinearGradient.cs +++ b/Crow/src/Mono.Cairo/LinearGradient.cs @@ -29,7 +29,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class LinearGradient : Gradient { diff --git a/Crow/src/Mono.Cairo/Matrix.cs b/Crow/src/Mono.Cairo/Matrix.cs index 12f0cb92..9c30845c 100644 --- a/Crow/src/Mono.Cairo/Matrix.cs +++ b/Crow/src/Mono.Cairo/Matrix.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; -namespace Cairo { +namespace Crow.Cairo { [StructLayout(LayoutKind.Sequential)] public class Matrix //: ICloneable @@ -114,7 +114,7 @@ namespace Cairo { NativeMethods.cairo_matrix_rotate (this, radians); } - public Cairo.Status Invert () + public Crow.Cairo.Status Invert () { return NativeMethods.cairo_matrix_invert (this); } diff --git a/Crow/src/Mono.Cairo/MeshPattern.cs b/Crow/src/Mono.Cairo/MeshPattern.cs index b14c709b..96bc3c85 100644 --- a/Crow/src/Mono.Cairo/MeshPattern.cs +++ b/Crow/src/Mono.Cairo/MeshPattern.cs @@ -29,7 +29,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class MeshPattern : Pattern { diff --git a/Crow/src/Mono.Cairo/NativeMethods.cs b/Crow/src/Mono.Cairo/NativeMethods.cs index 8ed90290..5c4dfcf7 100644 --- a/Crow/src/Mono.Cairo/NativeMethods.cs +++ b/Crow/src/Mono.Cairo/NativeMethods.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; -namespace Cairo +namespace Crow.Cairo { // sort the functions like in the following page so it is easier to find what is missing // http://cairographics.org/manual/index-all.html @@ -270,13 +270,13 @@ namespace Cairo #region Image Surface [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] - internal static extern IntPtr cairo_image_surface_create (Cairo.Format format, int width, int height); + internal static extern IntPtr cairo_image_surface_create (Crow.Cairo.Format format, int width, int height); [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] - internal static extern IntPtr cairo_image_surface_create_for_data (byte[] data, Cairo.Format format, int width, int height, int stride); + internal static extern IntPtr cairo_image_surface_create_for_data (byte[] data, Crow.Cairo.Format format, int width, int height, int stride); [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] - internal static extern IntPtr cairo_image_surface_create_for_data (IntPtr data, Cairo.Format format, int width, int height, int stride); + internal static extern IntPtr cairo_image_surface_create_for_data (IntPtr data, Crow.Cairo.Format format, int width, int height, int stride); [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] internal static extern IntPtr cairo_image_surface_create_from_png (string filename); @@ -698,7 +698,7 @@ namespace Cairo internal static extern int cairo_get_dash_count (IntPtr cr); [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] - internal static extern void cairo_set_fill_rule (IntPtr cr, Cairo.FillRule fill_rule); + internal static extern void cairo_set_fill_rule (IntPtr cr, Crow.Cairo.FillRule fill_rule); [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] internal static extern void cairo_set_font_face (IntPtr cr, IntPtr fontFace); @@ -728,7 +728,7 @@ namespace Cairo internal static extern void cairo_set_miter_limit (IntPtr cr, double limit); [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] - internal static extern void cairo_set_operator (IntPtr cr, Cairo.Operator op); + internal static extern void cairo_set_operator (IntPtr cr, Crow.Cairo.Operator op); [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] internal static extern void cairo_set_source (IntPtr cr, IntPtr pattern); @@ -777,7 +777,7 @@ namespace Cairo #region Surface [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] - internal static extern IntPtr cairo_surface_create_similar (IntPtr surface, Cairo.Content content, int width, int height); + internal static extern IntPtr cairo_surface_create_similar (IntPtr surface, Crow.Cairo.Content content, int width, int height); [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] internal static extern void cairo_surface_destroy (IntPtr surface); diff --git a/Crow/src/Mono.Cairo/Operator.cs b/Crow/src/Mono.Cairo/Operator.cs index f233a25f..1c11cccc 100644 --- a/Crow/src/Mono.Cairo/Operator.cs +++ b/Crow/src/Mono.Cairo/Operator.cs @@ -31,7 +31,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum Operator diff --git a/Crow/src/Mono.Cairo/PSSurface.cs b/Crow/src/Mono.Cairo/PSSurface.cs index 9d6b73be..cf90794e 100644 --- a/Crow/src/Mono.Cairo/PSSurface.cs +++ b/Crow/src/Mono.Cairo/PSSurface.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class PSSurface : Surface { diff --git a/Crow/src/Mono.Cairo/Path.cs b/Crow/src/Mono.Cairo/Path.cs index 184c606c..a55f03b0 100644 --- a/Crow/src/Mono.Cairo/Path.cs +++ b/Crow/src/Mono.Cairo/Path.cs @@ -30,9 +30,9 @@ using System; using System.Runtime.InteropServices; -using Cairo; +using Crow.Cairo; -namespace Cairo { +namespace Crow.Cairo { public class Path : IDisposable { diff --git a/Crow/src/Mono.Cairo/Pattern.cs b/Crow/src/Mono.Cairo/Pattern.cs index bc0a962a..3e933a19 100644 --- a/Crow/src/Mono.Cairo/Pattern.cs +++ b/Crow/src/Mono.Cairo/Pattern.cs @@ -30,7 +30,7 @@ using System; using System.Collections; -namespace Cairo { +namespace Crow.Cairo { public class Pattern : IDisposable { diff --git a/Crow/src/Mono.Cairo/PatternType.cs b/Crow/src/Mono.Cairo/PatternType.cs index f9b9523a..deac3ab7 100644 --- a/Crow/src/Mono.Cairo/PatternType.cs +++ b/Crow/src/Mono.Cairo/PatternType.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public enum PatternType diff --git a/Crow/src/Mono.Cairo/PdfSurface.cs b/Crow/src/Mono.Cairo/PdfSurface.cs index c980f249..09a2d126 100644 --- a/Crow/src/Mono.Cairo/PdfSurface.cs +++ b/Crow/src/Mono.Cairo/PdfSurface.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class PdfSurface : Surface { diff --git a/Crow/src/Mono.Cairo/Point.cs b/Crow/src/Mono.Cairo/Point.cs index e72ca6c5..cf07f311 100644 --- a/Crow/src/Mono.Cairo/Point.cs +++ b/Crow/src/Mono.Cairo/Point.cs @@ -34,7 +34,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -namespace Cairo { +namespace Crow.Cairo { public struct Point { public Point (int x, int y) diff --git a/Crow/src/Mono.Cairo/PointD.cs b/Crow/src/Mono.Cairo/PointD.cs index c2e3587d..8bc019c9 100644 --- a/Crow/src/Mono.Cairo/PointD.cs +++ b/Crow/src/Mono.Cairo/PointD.cs @@ -34,7 +34,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -namespace Cairo { +namespace Crow.Cairo { public struct PointD { diff --git a/Crow/src/Mono.Cairo/RadialGradient.cs b/Crow/src/Mono.Cairo/RadialGradient.cs index 6422e00d..6abe2671 100644 --- a/Crow/src/Mono.Cairo/RadialGradient.cs +++ b/Crow/src/Mono.Cairo/RadialGradient.cs @@ -29,7 +29,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class RadialGradient : Gradient { diff --git a/Crow/src/Mono.Cairo/Region.cs b/Crow/src/Mono.Cairo/Region.cs index 4a82842a..5e8d8d60 100644 --- a/Crow/src/Mono.Cairo/Region.cs +++ b/Crow/src/Mono.Cairo/Region.cs @@ -23,7 +23,7 @@ using System; using System.Runtime.InteropServices; -namespace Cairo +namespace Crow.Cairo { [StructLayout(LayoutKind.Sequential)] public struct RectangleList { diff --git a/Crow/src/Mono.Cairo/ScaledFont.cs b/Crow/src/Mono.Cairo/ScaledFont.cs index 93719460..594d1be9 100644 --- a/Crow/src/Mono.Cairo/ScaledFont.cs +++ b/Crow/src/Mono.Cairo/ScaledFont.cs @@ -26,7 +26,7 @@ using System; using System.Runtime.InteropServices; -namespace Cairo { +namespace Crow.Cairo { public class ScaledFont : IDisposable { diff --git a/Crow/src/Mono.Cairo/SolidPattern.cs b/Crow/src/Mono.Cairo/SolidPattern.cs index 37864e5b..6cd89f85 100644 --- a/Crow/src/Mono.Cairo/SolidPattern.cs +++ b/Crow/src/Mono.Cairo/SolidPattern.cs @@ -29,7 +29,7 @@ using System; using Color = Crow.Color; -namespace Cairo { +namespace Crow.Cairo { public class SolidPattern : Pattern { diff --git a/Crow/src/Mono.Cairo/Status.cs b/Crow/src/Mono.Cairo/Status.cs index 54b2fec3..2df15580 100644 --- a/Crow/src/Mono.Cairo/Status.cs +++ b/Crow/src/Mono.Cairo/Status.cs @@ -32,7 +32,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum Status diff --git a/Crow/src/Mono.Cairo/SubpixelOrder.cs b/Crow/src/Mono.Cairo/SubpixelOrder.cs index 3c3a3362..95f3cbee 100644 --- a/Crow/src/Mono.Cairo/SubpixelOrder.cs +++ b/Crow/src/Mono.Cairo/SubpixelOrder.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo +namespace Crow.Cairo { public enum SubpixelOrder diff --git a/Crow/src/Mono.Cairo/Surface.cs b/Crow/src/Mono.Cairo/Surface.cs index 14f4a2b1..88ebb107 100644 --- a/Crow/src/Mono.Cairo/Surface.cs +++ b/Crow/src/Mono.Cairo/Surface.cs @@ -36,7 +36,7 @@ using System; using System.Collections; -namespace Cairo { +namespace Crow.Cairo { public class Surface : IDisposable { @@ -91,28 +91,28 @@ namespace Cairo { } [Obsolete ("Use an ImageSurface constructor instead.")] - public static Cairo.Surface CreateForImage ( - ref byte[] data, Cairo.Format format, int width, int height, int stride) + public static Crow.Cairo.Surface CreateForImage ( + ref byte[] data, Crow.Cairo.Format format, int width, int height, int stride) { IntPtr p = NativeMethods.cairo_image_surface_create_for_data ( data, format, width, height, stride); - return new Cairo.Surface (p, true); + return new Crow.Cairo.Surface (p, true); } [Obsolete ("Use an ImageSurface constructor instead.")] - public static Cairo.Surface CreateForImage ( - Cairo.Format format, int width, int height) + public static Crow.Cairo.Surface CreateForImage ( + Crow.Cairo.Format format, int width, int height) { IntPtr p = NativeMethods.cairo_image_surface_create ( format, width, height); - return new Cairo.Surface (p, true); + return new Crow.Cairo.Surface (p, true); } - public Cairo.Surface CreateSimilar ( - Cairo.Content content, int width, int height) + public Crow.Cairo.Surface CreateSimilar ( + Crow.Cairo.Content content, int width, int height) { IntPtr p = NativeMethods.cairo_surface_create_similar ( this.Handle, content, width, height); diff --git a/Crow/src/Mono.Cairo/SurfacePattern.cs b/Crow/src/Mono.Cairo/SurfacePattern.cs index 4422b11d..53a90d38 100644 --- a/Crow/src/Mono.Cairo/SurfacePattern.cs +++ b/Crow/src/Mono.Cairo/SurfacePattern.cs @@ -29,7 +29,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class SurfacePattern : Pattern { diff --git a/Crow/src/Mono.Cairo/SurfaceType.cs b/Crow/src/Mono.Cairo/SurfaceType.cs index b0b659c6..bd992db0 100644 --- a/Crow/src/Mono.Cairo/SurfaceType.cs +++ b/Crow/src/Mono.Cairo/SurfaceType.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public enum SurfaceType diff --git a/Crow/src/Mono.Cairo/SvgSurface.cs b/Crow/src/Mono.Cairo/SvgSurface.cs index 41829501..c7d72988 100644 --- a/Crow/src/Mono.Cairo/SvgSurface.cs +++ b/Crow/src/Mono.Cairo/SvgSurface.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class SvgSurface : Surface { diff --git a/Crow/src/Mono.Cairo/SvgVersion.cs b/Crow/src/Mono.Cairo/SvgVersion.cs index 7f0f4620..916fb861 100644 --- a/Crow/src/Mono.Cairo/SvgVersion.cs +++ b/Crow/src/Mono.Cairo/SvgVersion.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public enum SvgVersion diff --git a/Crow/src/Mono.Cairo/TextExtents.cs b/Crow/src/Mono.Cairo/TextExtents.cs index f9cd560f..965ca046 100644 --- a/Crow/src/Mono.Cairo/TextExtents.cs +++ b/Crow/src/Mono.Cairo/TextExtents.cs @@ -31,7 +31,7 @@ using System; using System.Runtime.InteropServices; -namespace Cairo +namespace Crow.Cairo { [StructLayout (LayoutKind.Sequential)] public struct TextExtents diff --git a/Crow/src/Mono.Cairo/WGLDevice.cs b/Crow/src/Mono.Cairo/WGLDevice.cs index 03f7e3a4..308cfadd 100644 --- a/Crow/src/Mono.Cairo/WGLDevice.cs +++ b/Crow/src/Mono.Cairo/WGLDevice.cs @@ -29,7 +29,7 @@ // using System; -namespace Cairo +namespace Crow.Cairo { public class WGLDevice : Device { diff --git a/Crow/src/Mono.Cairo/Win32Surface.cs b/Crow/src/Mono.Cairo/Win32Surface.cs index dd244286..4776a19b 100644 --- a/Crow/src/Mono.Cairo/Win32Surface.cs +++ b/Crow/src/Mono.Cairo/Win32Surface.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class Win32Surface : Surface { diff --git a/Crow/src/Mono.Cairo/XcbSurface.cs b/Crow/src/Mono.Cairo/XcbSurface.cs index 340b0fae..32a67848 100644 --- a/Crow/src/Mono.Cairo/XcbSurface.cs +++ b/Crow/src/Mono.Cairo/XcbSurface.cs @@ -28,7 +28,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class XcbSurface : Surface { internal XcbSurface (IntPtr handle, bool owns) : base (handle, owns) diff --git a/Crow/src/Mono.Cairo/XlibSurface.cs b/Crow/src/Mono.Cairo/XlibSurface.cs index c0003a49..186024e9 100644 --- a/Crow/src/Mono.Cairo/XlibSurface.cs +++ b/Crow/src/Mono.Cairo/XlibSurface.cs @@ -34,7 +34,7 @@ using System; -namespace Cairo { +namespace Crow.Cairo { public class XlibSurface : Surface { diff --git a/Crow/src/Picture.cs b/Crow/src/Picture.cs index f2f45261..133bc4ef 100644 --- a/Crow/src/Picture.cs +++ b/Crow/src/Picture.cs @@ -26,7 +26,7 @@ using System; using System.IO; -using Cairo; +using Crow.Cairo; using System.Collections.Generic; namespace Crow diff --git a/Crow/src/Point.cs b/Crow/src/Point.cs index 08dd4436..de9df7c8 100644 --- a/Crow/src/Point.cs +++ b/Crow/src/Point.cs @@ -58,13 +58,13 @@ namespace Crow public double LengthD { get { return Math.Sqrt (Math.Pow (_x, 2) + Math.Pow (_y, 2)); } } - public static implicit operator Cairo.Point(Point p) + public static implicit operator Crow.Cairo.Point(Point p) { - return new Cairo.Point(p.X, p.Y); + return new Crow.Cairo.Point(p.X, p.Y); } - public static implicit operator Cairo.PointD(Point p) + public static implicit operator Crow.Cairo.PointD(Point p) { - return new Cairo.PointD(p.X, p.Y); + return new Crow.Cairo.PointD(p.X, p.Y); } public static implicit operator Point(int i) { diff --git a/Crow/src/SolidColor.cs b/Crow/src/SolidColor.cs index d6423d31..f14c7cf7 100644 --- a/Crow/src/SolidColor.cs +++ b/Crow/src/SolidColor.cs @@ -31,7 +31,7 @@ using System.Text; using System.Xml.Serialization; using System.Reflection; using System.Diagnostics; -using Cairo; +using Crow.Cairo; diff --git a/Crow/src/SvgPicture.cs b/Crow/src/SvgPicture.cs index dee6c8e0..33f68955 100644 --- a/Crow/src/SvgPicture.cs +++ b/Crow/src/SvgPicture.cs @@ -26,7 +26,7 @@ using System; using System.IO; -using Cairo; +using Crow.Cairo; namespace Crow { diff --git a/Crow/src/backends/IBackend.cs b/Crow/src/backends/IBackend.cs index 3275205e..f33dd8f8 100644 --- a/Crow/src/backends/IBackend.cs +++ b/Crow/src/backends/IBackend.cs @@ -27,6 +27,22 @@ using System; namespace Crow { + public enum MouseCursors + { + Default, + Cross, + Arrow, + Text, + SW, + SE, + NW, + NE, + N, + S, + V, + H, + MaxEnum, + } public interface IBackend { void Init(Interface iFace); @@ -34,6 +50,9 @@ namespace Crow void Flush(); void ProcessEvents(); + void SetCursor (MouseCursors newCur); + void SetCursorPosition (int x, int y); + bool IsDown (Key key); bool Shift { get; } bool Ctrl { get; } diff --git a/Crow/src/backends/win32/WinBackend.cs b/Crow/src/backends/win32/WinBackend.cs old mode 100755 new mode 100644 index 183adc12..66157fe7 --- a/Crow/src/backends/win32/WinBackend.cs +++ b/Crow/src/backends/win32/WinBackend.cs @@ -105,7 +105,7 @@ namespace Crow.Win32 User32.Window.ShowWindow(handle, ShowWindowCommand.Show); hdc = User32.Window.GetDC(handle); - iFace.surf = new Cairo.Win32Surface(hdc); + iFace.surf = new Crow.Cairo.Win32Surface(hdc); } @@ -464,6 +464,15 @@ namespace Crow.Win32 return User32.Window.DefWindowProc(handle, message, wParam, lParam); } - } + public void SetCursor (MouseCursors newCur) + { + throw new NotImplementedException (); + } + + public void SetCursorPosition (int x, int y) + { + throw new NotImplementedException (); + } + } } diff --git a/Crow/src/backends/xcb/XCBBackend.cs b/Crow/src/backends/xcb/XCBBackend.cs index 93a9be63..51ea91bd 100644 --- a/Crow/src/backends/xcb/XCBBackend.cs +++ b/Crow/src/backends/xcb/XCBBackend.cs @@ -419,7 +419,7 @@ namespace Crow.XCB loadCursors (); - iFace.surf = new Cairo.XcbSurface (conn, win, visual, iFace.ClientRectangle.Width, iFace.ClientRectangle.Height); + iFace.surf = new Crow.Cairo.XcbSurface (conn, win, visual, iFace.ClientRectangle.Width, iFace.ClientRectangle.Height); } public void CleanUp () @@ -514,6 +514,15 @@ namespace Crow.XCB return IntPtr.Zero; } + public void SetCursor (MouseCursors newCur) + { + throw new NotImplementedException (); + } + + public void SetCursorPosition (int x, int y) + { + throw new NotImplementedException (); + } } } diff --git a/Crow/src/backends/xlib/XLibBackend.cs b/Crow/src/backends/xlib/XLibBackend.cs index 111296e3..9271144f 100644 --- a/Crow/src/backends/xlib/XLibBackend.cs +++ b/Crow/src/backends/xlib/XLibBackend.cs @@ -32,43 +32,60 @@ namespace Crow.XLib public class XLibBackend : IBackend { #region pinvoke - [DllImportAttribute("X11")] + [DllImport("X11")] static extern int XInitThreads(); - [DllImportAttribute("X11")] + [DllImport("X11")] internal static extern IntPtr XOpenDisplay(IntPtr displayName); - [DllImportAttribute("X11")] + [DllImport("X11")] internal static extern IntPtr XCloseDisplay(IntPtr disp); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern Int32 XDefaultScreen(IntPtr disp); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern IntPtr XDefaultRootWindow(IntPtr disp); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern UInt32 XDefaultDepth (IntPtr disp, Int32 screen); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern IntPtr XDefaultVisual(IntPtr disp, Int32 screen); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern IntPtr XCreateSimpleWindow(IntPtr disp, IntPtr rootWindow, Int32 x, Int32 y, UInt32 width, UInt32 height, UInt32 borderWidth, IntPtr border, IntPtr background); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern IntPtr XCreatePixmap(IntPtr disp, IntPtr rootWindow, UInt32 width, UInt32 height, UInt32 depth); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern IntPtr XFreePixmap(IntPtr disp, IntPtr pixmap); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern IntPtr XFree(IntPtr data); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern Int32 XSelectInput(IntPtr disp, IntPtr win, EventMask eventMask); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern Int32 XMapWindow(IntPtr disp, IntPtr win); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern int XPending (IntPtr disp); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern IntPtr XNextEvent(IntPtr disp, ref XEvent xevent); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern Int32 XSync(IntPtr disp, int discard); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern int XConnectionNumber(IntPtr disp); - [DllImportAttribute("X11")] + [DllImport("X11")] static extern IntPtr XSetErrorHandler(XErrorHandler error_handler); + [DllImport ("X11")] + static extern int XDefineCursor (IntPtr disp, IntPtr wnd, IntPtr cursor); + + [DllImport ("X11")] + static extern uint XWarpPointer (IntPtr disp, IntPtr src_w, IntPtr dest_w, int src_x, int src_y, uint src_width, uint src_height, int dest_x, int dest_y); + + [DllImport ("libXcursor.so.1")] + static extern int XcursorGetDefaultSize (IntPtr dpy); + [DllImport ("libXcursor.so.1")] + static extern string XcursorGetTheme (IntPtr dpy); + [DllImport ("libXcursor.so.1")] + static extern IntPtr XcursorLibraryLoadImage (string name, string theme, int size); + [DllImport ("libXcursor.so.1")] + static extern void XcursorImageDestroy (IntPtr image); + + [DllImport ("libXcursor.so.1")] + static extern IntPtr XcursorImageLoadCursor (IntPtr dpy, IntPtr image); #endregion @@ -80,6 +97,8 @@ namespace Crow.XLib Interface iFace; X11Keyboard keyboard; + IntPtr [] cursors = new IntPtr [(int)MouseCursors.MaxEnum]; + #region IBackend implementation public void Init (Interface _iFace) @@ -109,10 +128,12 @@ namespace Crow.XLib keyboard = new Crow.XLib.X11Keyboard (xDisp); - iFace.surf = new Cairo.XlibSurface (xDisp, xwinHnd, xDefaultVisual, iFace.ClientRectangle.Width, iFace.ClientRectangle.Height); + iFace.surf = new Crow.Cairo.XlibSurface (xDisp, xwinHnd, xDefaultVisual, iFace.ClientRectangle.Width, iFace.ClientRectangle.Height); errorHnd = new XErrorHandler (HandleError); XSetErrorHandler (errorHnd); + + loadCursors (); } public void CleanUp () @@ -122,7 +143,7 @@ namespace Crow.XLib XCloseDisplay (xDisp); } public void Flush () { - XSync (xDisp, 0); + XSync (xDisp, 1); } public void ProcessEvents () { @@ -169,20 +190,50 @@ namespace Crow.XLib throw new NotImplementedException (); } } - public bool Ctrl { get { throw new NotImplementedException (); } } - public bool Alt { get { throw new NotImplementedException (); } } + public void SetCursor (MouseCursors newCur) + { + XDefineCursor (xDisp, xwinHnd, cursors[(int)newCur]); + XSync (xDisp, 0); + } + public void SetCursorPosition (int x, int y) + { + XWarpPointer (xDisp, IntPtr.Zero, xwinHnd, 0, 0, 0, 0, x, y); + } #endregion + void loadCursor (MouseCursors id, string name) + { + IntPtr img = XcursorLibraryLoadImage (name, null, XcursorGetDefaultSize (xDisp)); + cursors[(int)id] = XcursorImageLoadCursor (xDisp, img); + XcursorImageDestroy (img); + } + + void loadCursors () + { + loadCursor (MouseCursors.Default, "default"); + loadCursor (MouseCursors.Cross, "cross"); + loadCursor (MouseCursors.Arrow, "arrow"); + loadCursor (MouseCursors.Text, "text"); + loadCursor (MouseCursors.SW, "bottom_left_corner"); + loadCursor (MouseCursors.SE, "bottom_right_corner"); + loadCursor (MouseCursors.NW, "top_left_corner"); + loadCursor (MouseCursors.NE, "top_right_corner"); + loadCursor (MouseCursors.N, "top_side"); + loadCursor (MouseCursors.S, "bottom_side"); + loadCursor (MouseCursors.V, "size_ver"); + loadCursor (MouseCursors.H, "size_hor"); + } + int HandleError (IntPtr display, ref XErrorEvent error_event) { /*if (ErrorExceptions) @@ -198,6 +249,8 @@ namespace Crow.XLib Debug.WriteLine ("XERROR {0}", error_event.error_code); return 0; } + + } } diff --git a/Crow/src/debug/DbgEventTypeColors.cs b/Crow/src/debug/DbgEventTypeColors.cs index e0881182..1936704e 100644 --- a/Crow/src/debug/DbgEventTypeColors.cs +++ b/Crow/src/debug/DbgEventTypeColors.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; using System.Linq; namespace Crow diff --git a/Crow/src/debug/DbgLogViewer.cs b/Crow/src/debug/DbgLogViewer.cs index c10cfdf6..4ff6082e 100644 --- a/Crow/src/debug/DbgLogViewer.cs +++ b/Crow/src/debug/DbgLogViewer.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Cairo; +using Crow.Cairo; #if DEBUG_LOG namespace Crow diff --git a/Crow/src/debug/DebugLogger.cs b/Crow/src/debug/DebugLogger.cs index 38cbc2af..f1eaf9c8 100644 --- a/Crow/src/debug/DebugLogger.cs +++ b/Crow/src/debug/DebugLogger.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; using System.Collections.Generic; using System.Diagnostics; using System.IO; diff --git a/Crow/src/rsvg/Handle.cs b/Crow/src/rsvg/Handle.cs index e13f79ad..bab0584e 100644 --- a/Crow/src/rsvg/Handle.cs +++ b/Crow/src/rsvg/Handle.cs @@ -1,5 +1,5 @@ //Copyright GPL2 -using Cairo; +using Crow.Cairo; namespace Rsvg { @@ -108,7 +108,7 @@ namespace Rsvg { [DllImport("rsvg-2")] static extern void rsvg_handle_render_cairo_sub(IntPtr raw, IntPtr cr, string id); - public void RenderCairoSub(Cairo.Context cr, string id) { + public void RenderCairoSub(Crow.Cairo.Context cr, string id) { rsvg_handle_render_cairo_sub(Raw, cr == null ? IntPtr.Zero : cr.Handle, id); } diff --git a/CrowIDE/src/DesignInterface.cs b/CrowIDE/src/DesignInterface.cs index ae9af80c..6d2f8b5b 100644 --- a/CrowIDE/src/DesignInterface.cs +++ b/CrowIDE/src/DesignInterface.cs @@ -30,7 +30,7 @@ using System.Threading; using System.Collections.Generic; using System.Diagnostics; using System.IO; -using Cairo; +using Crow.Cairo; namespace Crow.Coding { diff --git a/CrowIDE/src/Editors/CodeBuffer/TextEditor.cs b/CrowIDE/src/Editors/CodeBuffer/TextEditor.cs index 21459406..7761263b 100644 --- a/CrowIDE/src/Editors/CodeBuffer/TextEditor.cs +++ b/CrowIDE/src/Editors/CodeBuffer/TextEditor.cs @@ -28,7 +28,7 @@ using System; using System.Xml.Serialization; using System.ComponentModel; using System.Collections; -using Cairo; +using Crow.Cairo; using System.Text; using System.Collections.Generic; using System.Text.RegularExpressions; @@ -461,12 +461,12 @@ namespace Crow.Text public override void onMouseEnter (object sender, MouseMoveEventArgs e) { base.onMouseEnter (sender, e); - IFace.MouseCursor = XCursor.Text; + IFace.MouseCursor = MouseCursors.Text; } public override void onMouseLeave (object sender, MouseMoveEventArgs e) { base.onMouseLeave (sender, e); - IFace.MouseCursor = XCursor.Default; + IFace.MouseCursor = MouseCursors.Default; } public override void onMouseMove (object sender, MouseMoveEventArgs e) { diff --git a/CrowIDE/src/Editors/ImlVisualEditor.cs b/CrowIDE/src/Editors/ImlVisualEditor.cs index 616d9a6b..ccfb2114 100644 --- a/CrowIDE/src/Editors/ImlVisualEditor.cs +++ b/CrowIDE/src/Editors/ImlVisualEditor.cs @@ -29,7 +29,7 @@ using Crow.IML; using System.Text; using System.Xml; using System.Diagnostics; -using Cairo; +using Crow.Cairo; namespace Crow.Coding { @@ -388,7 +388,7 @@ namespace Crow.Coding } - protected override void onDraw (Cairo.Context gr) + protected override void onDraw (Crow.Cairo.Context gr) { base.onDraw (gr); @@ -515,8 +515,8 @@ namespace Crow.Coding double z = zoom / 100.0; double coteW = 3, coteL = 5; bool fill = true; - Cairo.PointD p1 = new Cairo.PointD (hr.X + 0.5, hr.Y - space); - Cairo.PointD p2 = new Cairo.PointD (hr.Right - 0.5, hr.Y - space); + Crow.Cairo.PointD p1 = new Crow.Cairo.PointD (hr.X + 0.5, hr.Y - space); + Crow.Cairo.PointD p2 = new Crow.Cairo.PointD (hr.Right - 0.5, hr.Y - space); if (p1.Y < cb.Top) { if (hr.Bottom > cb.Bottom - space) @@ -536,8 +536,8 @@ namespace Crow.Coding drawCenteredTextLine (gr, p1.Add(p2.Substract(p1).Divide (2)), g.Width.Value.ToString()); } - p1 = new Cairo.PointD (hr.X - space, hr.Top + 0.5); - p2 = new Cairo.PointD (hr.X - space, hr.Bottom - 0.5); + p1 = new Crow.Cairo.PointD (hr.X - space, hr.Top + 0.5); + p2 = new Crow.Cairo.PointD (hr.X - space, hr.Bottom - 0.5); if (p1.X < cb.Left) { if (hr.Right > cb.Right - space) diff --git a/CrowIDE/src/Editors/SourceEditor.cs b/CrowIDE/src/Editors/SourceEditor.cs index d1e1ba8e..a85e2403 100644 --- a/CrowIDE/src/Editors/SourceEditor.cs +++ b/CrowIDE/src/Editors/SourceEditor.cs @@ -28,7 +28,7 @@ using System; using System.Xml.Serialization; using System.ComponentModel; using System.Collections; -using Cairo; +using Crow.Cairo; using System.Text; using System.Collections.Generic; using System.Text.RegularExpressions; @@ -926,14 +926,14 @@ namespace Crow.Coding { base.onMouseEnter (sender, e); if (e.X - ScreenCoordinates(Slot).X < leftMargin + ClientRectangle.X) - IFace.MouseCursor = XCursor.Default; + IFace.MouseCursor = MouseCursors.Default; else - IFace.MouseCursor = XCursor.Text; + IFace.MouseCursor = MouseCursors.Text; } public override void onMouseLeave (object sender, MouseMoveEventArgs e) { base.onMouseLeave (sender, e); - IFace.MouseCursor = XCursor.Default; + IFace.MouseCursor = MouseCursors.Default; } public override void onMouseMove (object sender, MouseMoveEventArgs e) { @@ -945,9 +945,9 @@ namespace Crow.Coding if (!e.Mouse.IsButtonDown (MouseButton.Left)) { if (mouseLocalPos.X < leftMargin) - IFace.MouseCursor = XCursor.Default; + IFace.MouseCursor = MouseCursors.Default; else - IFace.MouseCursor = XCursor.Text; + IFace.MouseCursor = MouseCursors.Text; return; } diff --git a/CrowIDE/src/Editors/SvgEditor.cs b/CrowIDE/src/Editors/SvgEditor.cs index 163b5ac1..cac03669 100644 --- a/CrowIDE/src/Editors/SvgEditor.cs +++ b/CrowIDE/src/Editors/SvgEditor.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; using System.ComponentModel; -using Cairo; +using Crow.Cairo; namespace Crow.Coding { diff --git a/CrowIDE/src/GraphicObjectDesignContainer.cs b/CrowIDE/src/GraphicObjectDesignContainer.cs index e5d620a6..e996ce3e 100644 --- a/CrowIDE/src/GraphicObjectDesignContainer.cs +++ b/CrowIDE/src/GraphicObjectDesignContainer.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; namespace Crow.Coding { diff --git a/CrowIDE/src/MemberView/MembersView.cs b/CrowIDE/src/MemberView/MembersView.cs index bd6ad144..27d1e025 100644 --- a/CrowIDE/src/MemberView/MembersView.cs +++ b/CrowIDE/src/MemberView/MembersView.cs @@ -25,7 +25,7 @@ using System.ComponentModel; using System.Reflection; using System.Collections.Generic; using System.Linq; -using Cairo; +using Crow.Cairo; namespace Crow.Coding { diff --git a/CrowIDE/src/VerticalLine.cs b/CrowIDE/src/VerticalLine.cs index 8644f81c..d7bfe0c1 100644 --- a/CrowIDE/src/VerticalLine.cs +++ b/CrowIDE/src/VerticalLine.cs @@ -34,7 +34,7 @@ namespace Crow.Coding { } - protected override void onDraw (Cairo.Context gr) + protected override void onDraw (Crow.Cairo.Context gr) { base.onDraw (gr); Foreground.SetAsSource (gr); diff --git a/MDCrow/AddinInfo.cs b/MDCrow/AddinInfo.cs new file mode 100644 index 00000000..331366c2 --- /dev/null +++ b/MDCrow/AddinInfo.cs @@ -0,0 +1,44 @@ +// +// AddinInfo.cs +// +// Author: +// Mikayla Hutchinson +// +// Copyright (c) 2017 Microsoft Corp. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using Mono.Addins; +using Mono.Addins.Description; + +[assembly: Addin ( + "MDCrow", + Namespace = "MonoDevelop", + Version = "1.0" +)] + +[assembly: AddinName ("MDCrow")] +[assembly: AddinCategory ("IDE extensions")] +[assembly: AddinDescription ("Crow interface designer")] +[assembly: AddinAuthor ("JP Bruyère")] + +[assembly: AddinDependency ("Core", MonoDevelop.BuildInfo.Version)] +[assembly: AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)] +//[assembly: AddinDependency ("::Core", "7.0")] +//[assembly: AddinDependency ("::Ide", "7.0")] diff --git a/MDCrow/MDCrow.addin.xml b/MDCrow/MDCrow.addin.xml new file mode 100644 index 00000000..24998c45 --- /dev/null +++ b/MDCrow/MDCrow.addin.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MDCrow/MDCrow.csproj b/MDCrow/MDCrow.csproj new file mode 100644 index 00000000..96c83ae8 --- /dev/null +++ b/MDCrow/MDCrow.csproj @@ -0,0 +1,30 @@ + + + net461 + 0.8.0 + + + + + + + + + + + + + + + diff --git a/MDCrow/obj/MDCrow.csproj.nuget.cache b/MDCrow/obj/MDCrow.csproj.nuget.cache new file mode 100644 index 00000000..5dc86cb7 --- /dev/null +++ b/MDCrow/obj/MDCrow.csproj.nuget.cache @@ -0,0 +1,5 @@ +{ + "version": 1, + "dgSpecHash": "NOLr8yug3fyGzNdtnGuiu+nsOLipm7yDza0aE769gwIvmZfTjFbAmOPxIueJkGAXWMxx8sw4H+nYZROzeSVvUQ==", + "success": true +} \ No newline at end of file diff --git a/MDCrow/obj/MDCrow.csproj.nuget.g.props b/MDCrow/obj/MDCrow.csproj.nuget.g.props new file mode 100644 index 00000000..ce1dceb5 --- /dev/null +++ b/MDCrow/obj/MDCrow.csproj.nuget.g.props @@ -0,0 +1,18 @@ + + + + True + NuGet + /mnt/devel/gts/crow/MDCrow/obj/project.assets.json + /home/jp/.nuget/packages/ + /home/jp/.nuget/packages/;/usr/share/dotnet/sdk/NuGetFallbackFolder + PackageReference + 4.7.0 + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + \ No newline at end of file diff --git a/MDCrow/obj/MDCrow.csproj.nuget.g.targets b/MDCrow/obj/MDCrow.csproj.nuget.g.targets new file mode 100644 index 00000000..175c03f4 --- /dev/null +++ b/MDCrow/obj/MDCrow.csproj.nuget.g.targets @@ -0,0 +1,9 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + \ No newline at end of file diff --git a/MDCrow/obj/project.assets.json b/MDCrow/obj/project.assets.json new file mode 100644 index 00000000..d32ce722 --- /dev/null +++ b/MDCrow/obj/project.assets.json @@ -0,0 +1,111 @@ +{ + "version": 3, + "targets": { + ".NETFramework,Version=v4.6.1": { + "MonoDevelop.Addins/0.4.7": { + "type": "package", + "build": { + "build/MonoDevelop.Addins.props": {}, + "build/MonoDevelop.Addins.targets": {} + } + }, + "Crow/1.0.0": { + "type": "project", + "compile": { + "bin/placeholder/Crow.dll": {} + }, + "runtime": { + "bin/placeholder/Crow.dll": {} + } + } + } + }, + "libraries": { + "MonoDevelop.Addins/0.4.7": { + "sha512": "eUqhwtcw224cx8OjkGaCwVsl4UO78X4nE3r1PpQVGaJWopwaUvKbyDfNmGxpDAKO5/+K4v3Dxxuz5zhFpz+6hQ==", + "type": "package", + "path": "monodevelop.addins/0.4.7", + "files": [ + ".signature.p7s", + "build/ICSharpCode.SharpZipLib.dll", + "build/Mono.Addins.CecilReflector.dll", + "build/Mono.Addins.Setup.dll", + "build/Mono.Addins.dll", + "build/Mono.Cecil.Mdb.dll", + "build/Mono.Cecil.Pdb.dll", + "build/Mono.Cecil.Rocks.dll", + "build/Mono.Cecil.dll", + "build/MonoDevelop.Addins.Tasks.dll", + "build/MonoDevelop.Addins.Tasks.pdb", + "build/MonoDevelop.Addins.props", + "build/MonoDevelop.Addins.targets", + "monodevelop.addins.0.4.7.nupkg.sha512", + "monodevelop.addins.nuspec" + ] + }, + "Crow/1.0.0": { + "type": "project", + "path": "../Crow/Crow.csproj", + "msbuildProject": "../Crow/Crow.csproj" + } + }, + "projectFileDependencyGroups": { + ".NETFramework,Version=v4.6.1": [ + "Crow >= 1.0.0", + "MonoDevelop.Addins >= 0.4.7" + ] + }, + "packageFolders": { + "/home/jp/.nuget/packages/": {}, + "/usr/share/dotnet/sdk/NuGetFallbackFolder": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "/mnt/devel/gts/crow/MDCrow/MDCrow.csproj", + "projectName": "MDCrow", + "projectPath": "/mnt/devel/gts/crow/MDCrow/MDCrow.csproj", + "packagesPath": "/home/jp/.nuget/packages/", + "outputPath": "/mnt/devel/gts/crow/MDCrow/obj", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "/usr/share/dotnet/sdk/NuGetFallbackFolder" + ], + "configFilePaths": [ + "/mnt/devel/gts/crow/.nuget/NuGet.config", + "/home/jp/.config/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net461" + ], + "sources": { + "/mnt/devel/gts/crow-xlib/build/Debug": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net461": { + "projectReferences": { + "/mnt/devel/gts/crow/Crow/Crow.csproj": { + "projectPath": "/mnt/devel/gts/crow/Crow/Crow.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net461": { + "dependencies": { + "MonoDevelop.Addins": { + "target": "Package", + "version": "[0.4.7, )" + } + } + } + } + } +} \ No newline at end of file diff --git a/MDCrow/src/CrowCanvas.cs b/MDCrow/src/CrowCanvas.cs new file mode 100644 index 00000000..c1942b84 --- /dev/null +++ b/MDCrow/src/CrowCanvas.cs @@ -0,0 +1,48 @@ +// +// CrowCanvas.cs +// +// Author: +// Jean-Philippe Bruyère +// +// Copyright (c) 2013-2017 Jean-Philippe Bruyère +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using System.Collections.Generic; +using System.IO; + +namespace MDCrow +{ + [System.ComponentModel.Category ("Crow.CrowDesigner")] + [System.ComponentModel.ToolboxItem (true)] + public class CrowCanvas : Gtk.DrawingArea + { + DesignInterface iface; + + public CrowCanvas () + { + } + public override void Dispose () + { + base.Dispose (); + iface.Dispose (); + } + + } +} diff --git a/MDCrow/src/CrowDisplayBinding.cs b/MDCrow/src/CrowDisplayBinding.cs new file mode 100644 index 00000000..627b480e --- /dev/null +++ b/MDCrow/src/CrowDisplayBinding.cs @@ -0,0 +1,57 @@ +// +// command.cs +// +// Author: +// jp <> +// +// Copyright (c) 2018 jp +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using MonoDevelop.Core; +using MonoDevelop.Ide.Gui; +using MonoDevelop.Projects; + + +namespace MDCrow +{ + class CrowDisplayBinding : IViewDisplayBinding + { + bool canHandle = false; + + public string Name { + get { + return GettextCatalog.GetString ("Crow designer"); + } + } + public bool CanUseAsDefault { get { return true; } } + + public bool CanHandle (FilePath fileName, string mimeType, Project ownerProject) + { + canHandle = mimeType.StartsWith ("text/x-goml", System.StringComparison.OrdinalIgnoreCase) | + mimeType.StartsWith ("text/x-crow", System.StringComparison.OrdinalIgnoreCase); + return canHandle; + } + + ViewContent IViewDisplayBinding.CreateContent (FilePath fileName, string mimeType, Project ownerProject) + { + return new CrowView (); + } + } +} \ No newline at end of file diff --git a/MDCrow/src/CrowView.cs b/MDCrow/src/CrowView.cs new file mode 100644 index 00000000..a1f73013 --- /dev/null +++ b/MDCrow/src/CrowView.cs @@ -0,0 +1,64 @@ +// +// CrowView.cs +// +// Author: +// Jean-Philippe Bruyère +// +// Copyright (c) 2013-2017 Jean-Philippe Bruyère +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using System.IO; +using System.Threading.Tasks; +using MonoDevelop.Components; +using MonoDevelop.Ide.Gui; +using Xwt; + +namespace MDCrow +{ + public class CrowView : ViewContent + { + CrowCanvas view; + + public override Control Control { + get { return view; } + } + + public CrowView () { + view = new CrowCanvas (); + + } + + string src; + + public override async Task Load (FileOpenInformation fileOpenInformation) + { + var fileName = fileOpenInformation.FileName; + using (Stream stream = File.OpenRead (fileName)) { + using (StreamReader sr = new StreamReader (stream)) { + src = await sr.ReadToEndAsync (); + } + } + + ContentName = fileName; + this.IsDirty = false; + view.SetFocus (); + } + } +} diff --git a/MDCrow/src/DesignInterface.cs b/MDCrow/src/DesignInterface.cs new file mode 100644 index 00000000..64c10c24 --- /dev/null +++ b/MDCrow/src/DesignInterface.cs @@ -0,0 +1,212 @@ +// +// DesignInterface.cs +// +// Author: +// Jean-Philippe Bruyère +// +// Copyright (c) 2013-2017 Jean-Philippe Bruyère +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using Crow; +using System.Globalization; +using System.Threading; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using Crow.Cairo; + +namespace MDCrow +{ + public class DesignInterface : Interface, IValueChange + { + #region IValueChange implementation + /// + /// Raise to notify that the value of a property has changed, the binding system + /// rely mainly on this event. the member name may not be present in the class, this is + /// used in **propertyless** bindings, this allow to raise custom named events without needing + /// to create an new one in the class or a new property. + /// + public event EventHandler ValueChanged; + /// + /// Helper function to raise the value changed event + /// + public virtual void NotifyValueChanged(string MemberName, object _value) + { + //Debug.WriteLine ("Value changed: {0}->{1} = {2}", this, MemberName, _value); + ValueChanged.Raise(this, new ValueChangeEventArgs(MemberName, _value)); + } + #endregion + + public DesignInterface () : base() + { + } + + //public ProjectFile ProjFile; + + + + public override Widget CreateInstance (string path) + { + ProjectFile pi; + + if (ProjFile.Project.solution.GetProjectFileFromPath (path, out pi)) + return CreateITorFromIMLFragment (pi.Source).CreateInstance(); + + return null; + } + public override Stream GetStreamFromPath (string path) + { + ProjectFile pi; + if (ProjFile.Project.solution.GetProjectFileFromPath (path, out pi)) { + return new FileStream (pi.AbsolutePath, FileMode.Open); + } + throw new Exception ($"In Design File not found: {path}"); + } + + protected override void InitBackend () + { + //surf = new Cairo.ImageSurface (Format.Argb32, 100, 100); + } + public override void ProcessResize (Rectangle bounds) + { + if (bounds == clientRectangle) + return; + lock (UpdateMutex) { + clientRectangle = bounds; + surf.Dispose (); + surf = new ImageSurface (Format.Argb32, clientRectangle.Width, clientRectangle.Height); + + foreach (Widget g in GraphicTree) + g.RegisterForLayouting (LayoutingType.All); + + RegisterClip (clientRectangle); + } + + } + public override bool ProcessMouseMove (int x, int y) + { + int deltaX = x - Mouse.X; + int deltaY = y - Mouse.Y; + Mouse.X = x; + Mouse.Y = y; + MouseMoveEventArgs e = new MouseMoveEventArgs (x, y, deltaX, deltaY); + e.Mouse = Mouse; + + if (ActiveWidget != null) { + //TODO, ensure object is still in the graphic tree + //send move evt even if mouse move outside bounds + ActiveWidget.onMouseMove (this, e); + if (!ActiveWidget.IsDragged)//if active is dragged, process mouse move as it was not visible. + return true; + } + + if (HoverWidget != null) { + + //check topmost graphicobject first + Widget tmp = HoverWidget; + Widget topc = null; + while (tmp is Widget) { + topc = tmp; + tmp = tmp.LogicalParent as Widget; + } + int idxhw = GraphicTree.IndexOf (topc); + if (idxhw != 0) { + int i = 0; + while (i < idxhw) { + if (GraphicTree [i].localLogicalParentIsNull) { + if (GraphicTree [i].MouseIsIn (e.Position)) { + while (HoverWidget != null) { + HoverWidget.onMouseLeave (HoverWidget, e); + HoverWidget = HoverWidget.LogicalParent as Widget; + } + + GraphicTree [i].checkHoverWidget (e); + return true; + } + } + i++; + } + } + + if (HoverWidget.MouseIsIn (e.Position)) { + if (!(HoverWidget is TemplatedControl)) + HoverWidget.checkHoverWidget (e); + return true; + } else { + HoverWidget.onMouseLeave (HoverWidget, e); + //seek upward from last focused graph obj's + while (HoverWidget.LogicalParent as Widget != null) { + HoverWidget = HoverWidget.LogicalParent as Widget; + if (HoverWidget.MouseIsIn (e.Position)) { + HoverWidget.checkHoverWidget (e); + return true; + } else + HoverWidget.onMouseLeave (HoverWidget, e); + } + } + } + + //top level graphic obj's parsing + lock (GraphicTree) { + for (int i = 0; i < GraphicTree.Count; i++) { + Widget g = GraphicTree [i]; + if (g.MouseIsIn (e.Position)) { + if (!(HoverWidget is TemplatedControl)) + g.checkHoverWidget (e); + if (g is Window) + PutOnTop (g); + return true; + } + } + } + HoverWidget = null; + return false; + } + + protected override void processLayouting () + { + #if MEASURE_TIME + layoutingMeasure.StartCycle(); + #endif + + if (Monitor.TryEnter (LayoutMutex)) { + DiscardQueue = new Queue (); + LayoutingQueueItem lqi; + while (LayoutingQueue.Count > 0) { + lqi = LayoutingQueue.Dequeue (); + //Console.WriteLine (lqi.ToString ()); + #if DEBUG_LAYOUTING + currentLQI = lqi; + curLQIsTries.Add(currentLQI); + #endif + lqi.ProcessLayouting (); + } + LayoutingQueue = DiscardQueue; + Monitor.Exit (LayoutMutex); + DiscardQueue = null; + } + + #if MEASURE_TIME + layoutingMeasure.StopCycle(); + #endif + } + } +} + diff --git a/MDCrow/src/MDCrowNodeExtension.cs b/MDCrow/src/MDCrowNodeExtension.cs new file mode 100644 index 00000000..115acc40 --- /dev/null +++ b/MDCrow/src/MDCrowNodeExtension.cs @@ -0,0 +1,131 @@ +// +// MDCrowNodeExtension.cs +// +// Author: +// Jean-Philippe Bruyère +// +// Copyright (c) 2013-2017 Jean-Philippe Bruyère +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using MonoDevelop.Components.Commands; +using MonoDevelop.Ide; +using MonoDevelop.Ide.Gui.Components; +using MonoDevelop.Projects; + +namespace MDCrow +{ + enum Commands + { + ShowCrowViewer + } + + class CrowNodeExtension : NodeBuilderExtension + { + public override Type CommandHandlerType { + get { return typeof (CrowCommandHandler); } + } + public override bool CanBuildNode (Type dataType) + { + return typeof (ProjectFile).IsAssignableFrom (dataType); + } + public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo) + { + ProjectFile pf = dataObject as ProjectFile; + + // string mimeType = DesktopService.GetMimeTypeForUri (pf.FilePath); + // if (mimeType.StartsWith ("image/", StringComparison.CurrentCultureIgnoreCase)) { + // Image i; + // if (pf != null) { + // i = Image.FromFile (pf.FilePath); + // nodeInfo.Icon = i.Scale (16.0 / i.Width, 16.0 / i.Height); + // } + // } + + base.BuildNode (treeBuilder, dataObject, nodeInfo); + } + } + + class CrowCommandHandler : NodeCommandHandler //, IPropertyPadProvider + { + [CommandHandler (Commands.ShowCrowViewer)] + protected void OnShowGOLibViewer () + { + + CrowView view = new CrowView (); + + ProjectFile file = CurrentNode.DataItem as ProjectFile; + + if (file != null) + view.Load (file.FilePath); + + + IdeApp.Workbench.OpenDocument (view, true); + //IdeApp.Workbench.Documents.Where (d => d.FileName == file.FilePath); + } + + // public override void ActivateItem () + // { + // ProjectFile o = this.CurrentNode.DataItem as ProjectFile; + // + // Ide.Gui.Document[] doc = IdeApp.Workbench.Documents.Where (d => d.FileName == o.FilePath).ToArray(); + // var tmp = MonoDevelop.Ide.Gui.DisplayBindingService.GetFileViewers (o.FilePath, o.Project).ToList(); + // + // OnShowGOLibViewer (); + // } + + // #region IPropertyPadProvider implementation + // public object GetActiveComponent () + // { + // if (CurrentNodes.Length == 1) + // return CurrentNode.DataItem; + // else + // return null; + // } + // public object GetProvider () + // { + // return null; + // } + // public void OnEndEditing (object obj) + // { + // throw new NotImplementedException (); + // } + // public void OnChanged (object obj) + // { + // + // } + // #endregion + } + + // class GOLibItemPropertyProvider : IPropertyProvider + // { + // #region IPropertyProvider implementation + // public object CreateProvider (object obj) + // { + // var projectFile = obj as ProjectFile; + // return projectFile; + // } + // + // public bool SupportsObject (object obj) + // { + // return obj is ProjectFile; + // } + // #endregion + // } +} diff --git a/Tests/BasicTests.cs b/Tests/BasicTests.cs index b4d7840c..662ad481 100644 --- a/Tests/BasicTests.cs +++ b/Tests/BasicTests.cs @@ -111,7 +111,7 @@ namespace tests // win.Show (); //app.LoadIMLFragment (@""); - app.CMDTest = new Command(new Action(() => app.AddWidget (app.instFileDlg.CreateInstance()).DataSource = app)) { Caption = "Test", Icon = new SvgPicture("#Tests.image.blank-file.svg"), CanExecute = true}; + //app.CMDTest = new Command(new Action(() => app.AddWidget (app.instFileDlg.CreateInstance()).DataSource = app)) { Caption = "Test", Icon = new SvgPicture("#Tests.image.blank-file.svg"), CanExecute = true}; //app.AddWidget (@"Interfaces/Divers/testFocus.crow").DataSource = app; //app.AddWidget (@"Interfaces/Divers/testMenu.crow").DataSource = app; //app.AddWidget (@"Interfaces/Divers/testVisibility.crow").DataSource = app; @@ -168,11 +168,12 @@ namespace tests app.NotifyValueChanged ("TestColor", Color.Red); else app.NotifyValueChanged ("TestColor", Color.Blue);*/ - + /*#if MEASURE_TIME foreach (PerformanceMeasure m in app.PerfMeasures) m.NotifyChanges (); #endif*/ + app.Update (); app.ProcessEvents (); //Thread.Sleep(1); } diff --git a/Tests/GraphicObjects/ColorCircleSelector.cs b/Tests/GraphicObjects/ColorCircleSelector.cs index eee1515d..43579d2a 100644 --- a/Tests/GraphicObjects/ColorCircleSelector.cs +++ b/Tests/GraphicObjects/ColorCircleSelector.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using Cairo; +using Crow.Cairo; using Crow; namespace Test diff --git a/Tests/GraphicObjects/HexaContainer.cs b/Tests/GraphicObjects/HexaContainer.cs index 23964e9c..c481095c 100644 --- a/Tests/GraphicObjects/HexaContainer.cs +++ b/Tests/GraphicObjects/HexaContainer.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; using Crow; -using Cairo; +using Crow.Cairo; namespace Tutorials2 { diff --git a/Tests/GraphicObjects/LaggingGraphicObject.cs b/Tests/GraphicObjects/LaggingGraphicObject.cs index b5b7811f..b3fb7123 100644 --- a/Tests/GraphicObjects/LaggingGraphicObject.cs +++ b/Tests/GraphicObjects/LaggingGraphicObject.cs @@ -26,7 +26,7 @@ using System; using Crow; using System.ComponentModel; -using Cairo; +using Crow.Cairo; using System.Diagnostics; namespace Crow diff --git a/Tests/GraphicObjects/SimpleGauge.cs b/Tests/GraphicObjects/SimpleGauge.cs index 2301812a..170a48ea 100644 --- a/Tests/GraphicObjects/SimpleGauge.cs +++ b/Tests/GraphicObjects/SimpleGauge.cs @@ -26,7 +26,7 @@ using System; using Crow; using System.ComponentModel; -using Cairo; +using Crow.Cairo; namespace Tutorials { diff --git a/Tests/GraphicObjects/TechBorder.cs b/Tests/GraphicObjects/TechBorder.cs index 4f818e51..3701a7e6 100644 --- a/Tests/GraphicObjects/TechBorder.cs +++ b/Tests/GraphicObjects/TechBorder.cs @@ -37,7 +37,7 @@ namespace Tests { return base.measureRawSize (lt) + 6; } - protected override void onDraw (Cairo.Context gr) + protected override void onDraw (Crow.Cairo.Context gr) { gr.Save (); @@ -51,7 +51,7 @@ namespace Tests gr.Restore (); } - void drawTechBorder1 (Cairo.Context gr){ + void drawTechBorder1 (Crow.Cairo.Context gr){ Rectangle r = ClientRectangle; double l1 = Math.Round(0.2 * Math.Min (r.Width, r.Height)) + 0.5; diff --git a/Tests/Interfaces/GraphicObject/0.crow b/Tests/Interfaces/GraphicObject/0.crow index d608cf00..542e2ba4 100755 --- a/Tests/Interfaces/GraphicObject/0.crow +++ b/Tests/Interfaces/GraphicObject/0.crow @@ -1,4 +1,4 @@ - - + +