From 0f0cb8dcc87bda217a405e9899ef6ccf1eaf6ac0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Sat, 3 Feb 2018 06:24:28 +0100 Subject: [PATCH] cairo mesh pattern, docker tests --- Default.style | 7 ++ Templates/DockingView.template | 24 ++++ src/GraphicObjects/DockingView.cs | 166 ++++++++++++++++++++++++++ src/GraphicObjects/DocksView.cs | 91 ++++++++++++++ src/IML/{Context.cs => IMLContext.cs} | 4 +- src/Mono.Cairo/MeshPattern.cs | 98 +++++++++++++++ src/Mono.Cairo/NativeMethods.cs | 45 +++++++ src/Mono.Cairo/PatternType.cs | 2 + 8 files changed, 435 insertions(+), 2 deletions(-) create mode 100755 Templates/DockingView.template create mode 100644 src/GraphicObjects/DockingView.cs create mode 100644 src/GraphicObjects/DocksView.cs rename src/IML/{Context.cs => IMLContext.cs} (99%) create mode 100644 src/Mono.Cairo/MeshPattern.cs diff --git a/Default.style b/Default.style index 0db6a08a..07689b50 100644 --- a/Default.style +++ b/Default.style @@ -88,6 +88,13 @@ ToolWindow { Width = 150; Height = 150; } +DocksView { + AllowDrop = true; +} +DockingView { + Focusable = true; + AllowDrag = true; +} FileDialog { Template = #Crow.FileDialog.template; Focusable = true; diff --git a/Templates/DockingView.template b/Templates/DockingView.template new file mode 100755 index 00000000..0a3b4e01 --- /dev/null +++ b/Templates/DockingView.template @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/src/GraphicObjects/DockingView.cs b/src/GraphicObjects/DockingView.cs new file mode 100644 index 00000000..db11c08d --- /dev/null +++ b/src/GraphicObjects/DockingView.cs @@ -0,0 +1,166 @@ +// +// DockingView.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; + +namespace Crow +{ + public class DockingView : Window + { + #region CTOR + public DockingView () : base () + { + } + #endregion + + bool isDocked = false; + Alignment docking = Alignment.Center; + + Point lastMousePos; //last known mouse pos in this control + Point undockingMousePosOrig; //mouse pos when docking was donne, use for undocking on mouse move + Rectangle savedSlot; //last undocked slot recalled when view is undocked + bool wasResizable; + + public DocksView docker; + + public override void OnLayoutChanges (LayoutingType layoutType) + { + base.OnLayoutChanges (layoutType); + + if (isDocked) + return; + + if (docker == null) + return; + + Rectangle dvCliRect = docker.ClientRectangle; + + if (layoutType == LayoutingType.X) { + if (Slot.X < docker.DockingThreshold) + dock (Alignment.Left); + else if (Slot.Right > dvCliRect.Width - docker.DockingThreshold) + dock (Alignment.Right); + }else if (layoutType == LayoutingType.Y) { + if (Slot.Y < docker.DockingThreshold) + dock (Alignment.Top); + else if (Slot.Bottom > dvCliRect.Height - docker.DockingThreshold) + dock (Alignment.Bottom); + } + } + + public override void onMouseMove (object sender, MouseMoveEventArgs e) + { + lastMousePos = e.Position; + + if (this.HasFocus && e.Mouse.IsButtonDown (MouseButton.Left) && isDocked) { + if (docking == Alignment.Left) { + if (lastMousePos.X - undockingMousePosOrig.X > docker.DockingThreshold) + undock (); + } else if (docking == Alignment.Right) { + if (undockingMousePosOrig.X - lastMousePos.X > docker.DockingThreshold) + undock (); + } else if (docking == Alignment.Top) { + if (lastMousePos.Y - undockingMousePosOrig.Y > docker.DockingThreshold) + undock (); + } else if (docking == Alignment.Bottom) { + if (undockingMousePosOrig.Y - lastMousePos.Y > docker.DockingThreshold) + undock (); + } + return; + } + + base.onMouseMove (sender, e); + } + public override void onMouseDown (object sender, MouseButtonEventArgs e) + { + base.onMouseDown (sender, e); + + if (this.HasFocus && isDocked && e.Button == MouseButton.Left) + undockingMousePosOrig = lastMousePos; + } + +// protected override void onBorderMouseEnter (object sender, MouseMoveEventArgs e) +// { +// base.onBorderMouseEnter (sender, e); +// +// if (isDocked) { +// switch (docking) { +// case Alignment.Top: +// if (this.currentDirection != Window.Direction.S) +// onBorderMouseLeave (this, null); +// break; +// case Alignment.Left: +// if (this.currentDirection != Window.Direction.E) +// onBorderMouseLeave (this, null); +// break; +// case Alignment.TopLeft: +// break; +// case Alignment.Right: +// if (this.currentDirection != Window.Direction.W) +// onBorderMouseLeave (this, null); +// break; +// case Alignment.TopRight: +// break; +// case Alignment.Bottom: +// if (this.currentDirection != Window.Direction.N) +// onBorderMouseLeave (this, null); +// break; +// case Alignment.BottomLeft: +// break; +// case Alignment.BottomRight: +// break; +// case Alignment.Center: +// break; +// default: +// break; +// } +// } +// } + + void undock () { + docker.Undock(this); + + this.Left = savedSlot.Left; + this.Top = savedSlot.Top; + this.Width = savedSlot.Width; + this.Height = savedSlot.Height; + + isDocked = false; + Resizable = wasResizable; + } + void dock (Alignment align){ + this.Left = this.Top = 0; + isDocked = true; + docking = align; + undockingMousePosOrig = lastMousePos; + savedSlot = this.LastPaintedSlot; + wasResizable = Resizable; + Resizable = false; + + docker.Dock (this, align); + } + } +} + diff --git a/src/GraphicObjects/DocksView.cs b/src/GraphicObjects/DocksView.cs new file mode 100644 index 00000000..a93bdc78 --- /dev/null +++ b/src/GraphicObjects/DocksView.cs @@ -0,0 +1,91 @@ +// +// DocksView.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.Xml.Serialization; +using System.ComponentModel; +using System.Collections.Generic; + +namespace Crow +{ + public class DocksView : Group + { + List childViews = new List(); + GenericStack rootStack = null; + + public override void AddChild (GraphicObject g) + { + DockingView dv = g as DockingView; + if (g == null) + throw new Exception ("DocksView accept only DockingView as child"); + base.AddChild (g); + childViews.Add (dv); + dv.docker = this; + } + public override void RemoveChild (GraphicObject child) + { + DockingView dv = child as DockingView; + if (child == null) + throw new Exception ("DocksView accept only DockingView as child"); + base.RemoveChild (child); + childViews.Remove (dv); + dv.docker = this; + } + public void Dock (DockingView dv, Alignment pos){ + switch (pos) { + case Alignment.Top: + if (rootStack?.Orientation != Orientation.Vertical) + this.Width = Measure.Stretched; + break; + case Alignment.Bottom: + this.Width = Measure.Stretched; + break; + case Alignment.Left: + this.Height = Measure.Stretched; + break; + case Alignment.Right: + this.Height = Measure.Stretched; + break; + } + } + public void Undock (DockingView dv){ + } + + int dockingThreshold; + + [XmlAttributeAttribute][DefaultValue(10)] + public virtual int DockingThreshold { + get { return dockingThreshold; } + set { + if (dockingThreshold == value) + return; + dockingThreshold = value; + NotifyValueChanged ("DockingThreshold", dockingThreshold); + + } + } + } +} + diff --git a/src/IML/Context.cs b/src/IML/IMLContext.cs similarity index 99% rename from src/IML/Context.cs rename to src/IML/IMLContext.cs index 7c34745d..c8527087 100644 --- a/src/IML/Context.cs +++ b/src/IML/IMLContext.cs @@ -40,7 +40,7 @@ namespace Crow.IML /// /// Context while parsing IML, this will store what's needed only while parsing and not during instancing /// - public class Context + public class IMLContext { public XmlTextReader reader = null; public Type RootType = null; @@ -59,7 +59,7 @@ namespace Crow.IML public List UnresolvedTargets = new List(); - public Context (Type rootType) + public IMLContext (Type rootType) { RootType = rootType; dm = new DynamicMethod ("dyn_instantiator", diff --git a/src/Mono.Cairo/MeshPattern.cs b/src/Mono.Cairo/MeshPattern.cs new file mode 100644 index 00000000..b14c709b --- /dev/null +++ b/src/Mono.Cairo/MeshPattern.cs @@ -0,0 +1,98 @@ +// +// Mono.Cairo.Pattern.cs +// +// Author: Jordi Mas (jordi@ximian.com) +// Hisham Mardam Bey (hisham.mardambey@gmail.com) +// (C) Ximian Inc, 2004. +// +// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// +// 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; + +namespace Cairo { + + public class MeshPattern : Pattern + { + internal MeshPattern (IntPtr handle, bool owned) : base (handle, owned) + { + } + + public MeshPattern () + : base (NativeMethods.cairo_pattern_create_mesh(), true) + { + } + + //no idea why this is here, the base one is identical, but we can't remove it now + public new Extend Extend { + set { NativeMethods.cairo_pattern_set_extend (Handle, value); } + get { return NativeMethods.cairo_pattern_get_extend (Handle); } + } + + public Filter Filter { + set { NativeMethods.cairo_pattern_set_filter (Handle, value); } + get { return NativeMethods.cairo_pattern_get_filter (Handle); } + } + + public void BeginPatch(){ + NativeMethods.cairo_mesh_pattern_begin_patch (Handle); + } + public void EndPatch(){ + NativeMethods.cairo_mesh_pattern_end_patch (Handle); + } + public void MoveTo(double x, double y){ + NativeMethods.cairo_mesh_pattern_move_to (Handle, x, y); + } + public void LineTo(double x, double y){ + NativeMethods.cairo_mesh_pattern_line_to (Handle, x, y); + } + public void CurveTo(double x1, double y1, double x2, double y2, double x3, double y3) + { + NativeMethods.cairo_mesh_pattern_curve_to (Handle, x1, y1, x2, y2, x3, y3); + } + public void SetControlPoint(uint point_num, double x, double y){ + NativeMethods.cairo_mesh_pattern_set_control_point (Handle, point_num, x, y); + } + public void SetCornerColorRGB(uint corner_num, double r, double g, double b){ + NativeMethods.cairo_mesh_pattern_set_corner_color_rgb (Handle, corner_num, r, g, b); + } + public void SetCornerColorRGBA(uint corner_num, double r, double g, double b, double a){ + NativeMethods.cairo_mesh_pattern_set_corner_color_rgba (Handle, corner_num, r, g, b, a); + } + public uint PatchCount { + get { + uint count = 0; + NativeMethods.cairo_mesh_pattern_get_patch_count(Handle, out count); + return count; + } + } + public Path GetPath(uint patch_num){ + return new Path(NativeMethods.cairo_mesh_pattern_get_path(Handle, patch_num)); + } + public void GetControlPoint(){ + } + public void GetCornerColorRGBA(){ + + } + } +} + diff --git a/src/Mono.Cairo/NativeMethods.cs b/src/Mono.Cairo/NativeMethods.cs index 8286e2c2..53501369 100644 --- a/src/Mono.Cairo/NativeMethods.cs +++ b/src/Mono.Cairo/NativeMethods.cs @@ -445,6 +445,51 @@ namespace Cairo [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] internal static extern Status cairo_pattern_status (IntPtr pattern); + + //mesh pattern + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_pattern_create_mesh (); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_mesh_pattern_begin_patch (IntPtr pattern); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_mesh_pattern_end_patch (IntPtr pattern); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_mesh_pattern_move_to (IntPtr pattern, double x, double y); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_mesh_pattern_line_to (IntPtr pattern, double x, double y); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_mesh_pattern_curve_to (IntPtr pattern, double x1, double y1, + double x2, double y2, double x3, double y3); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_mesh_pattern_set_control_point (IntPtr pattern, uint point_num, double x, double y); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_mesh_pattern_set_corner_color_rgb (IntPtr pattern, uint corner_num, + double r, double g, double b); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_mesh_pattern_set_corner_color_rgba (IntPtr pattern, uint corner_num, + double r, double g, double b, double a); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern Status cairo_mesh_pattern_get_patch_count (IntPtr pattern, out uint count); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_mesh_pattern_get_path (IntPtr pattern, uint patch_num); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern Status cairo_mesh_pattern_get_control_point (IntPtr pattern, + uint patch_num, uint point_num, out double x, out double y); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern Status cairo_mesh_pattern_get_corner_color_rgba (IntPtr pattern, + uint patch_num, uint point_num, out double r, out double g, out double b, out double a); #endregion #region PdfSurface diff --git a/src/Mono.Cairo/PatternType.cs b/src/Mono.Cairo/PatternType.cs index 002469ff..8fe2d85d 100644 --- a/src/Mono.Cairo/PatternType.cs +++ b/src/Mono.Cairo/PatternType.cs @@ -37,6 +37,8 @@ namespace Cairo { Surface, Linear, Radial, + Mesh, + RasterSource } } -- 2.47.3