From f5e40d5832ad35028fac46efd8c1d6b0383e7561 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Sat, 3 Aug 2019 10:20:21 +0200 Subject: [PATCH] update CrowIDE --- Crow/src/GraphicObjects/Widget.cs | 13 +++--- Samples/CrowIDE/CrowIDE.csproj | 4 +- Samples/CrowIDE/src/CrowIDE.cs | 2 +- .../src/Editors/CodeBuffer/TextEditor.cs | 26 ++++++------ .../CrowIDE/src/Editors/ImlVisualEditor.cs | 11 +++-- Samples/CrowIDE/src/Editors/SourceEditor.cs | 40 +++++++++---------- .../src/GraphicObjectDesignContainer.cs | 3 +- .../TemplatedContainer/testPopper.crow | 2 +- .../TemplatedControl/testSpinner.crow | 2 +- 9 files changed, 50 insertions(+), 53 deletions(-) diff --git a/Crow/src/GraphicObjects/Widget.cs b/Crow/src/GraphicObjects/Widget.cs index 0f8f1805..c302a411 100644 --- a/Crow/src/GraphicObjects/Widget.cs +++ b/Crow/src/GraphicObjects/Widget.cs @@ -1701,11 +1701,11 @@ namespace Crow Rectangle rb = Slot + Parent.ClientRectangle.Position; if (clearBackground) { - ctx.Save (); - ctx.Operator = Operator.Clear; - ctx.Rectangle (rb); - ctx.Fill (); - ctx.Restore (); + ctx.Save (); + ctx.Operator = Operator.Clear; + ctx.Rectangle (rb); + ctx.Fill (); + ctx.Restore (); } ctx.SetSourceSurface (bmp, rb.X, rb.Y); @@ -1747,8 +1747,7 @@ namespace Crow onDraw (ctx); if (!isEnabled) paintDisabled (ctx, Slot); - - //ctx.Translate (-rb.X, -rb.Y); + ctx.Restore (); } LastPaintedSlot = Slot; diff --git a/Samples/CrowIDE/CrowIDE.csproj b/Samples/CrowIDE/CrowIDE.csproj index a78a55e8..6670a8ed 100644 --- a/Samples/CrowIDE/CrowIDE.csproj +++ b/Samples/CrowIDE/CrowIDE.csproj @@ -20,7 +20,7 @@ - + @@ -29,7 +29,7 @@ - icons.%(Filename)%(Extension) + CrowIDE.icons.%(Filename)%(Extension) diff --git a/Samples/CrowIDE/src/CrowIDE.cs b/Samples/CrowIDE/src/CrowIDE.cs index bf29e08a..1b6ed151 100644 --- a/Samples/CrowIDE/src/CrowIDE.cs +++ b/Samples/CrowIDE/src/CrowIDE.cs @@ -148,7 +148,7 @@ namespace Crow.Coding go.DataSource = this; mainDock = go.FindByName ("mainDock") as DockStack; - + ReopenLastSolution = false; if (ReopenLastSolution && !string.IsNullOrEmpty (LastOpenSolution)) { CurrentSolution = Solution.LoadSolution (LastOpenSolution); //lock(MainIFace.UpdateMutex) diff --git a/Samples/CrowIDE/src/Editors/CodeBuffer/TextEditor.cs b/Samples/CrowIDE/src/Editors/CodeBuffer/TextEditor.cs index d5c41ec4..8b16b9a8 100644 --- a/Samples/CrowIDE/src/Editors/CodeBuffer/TextEditor.cs +++ b/Samples/CrowIDE/src/Editors/CodeBuffer/TextEditor.cs @@ -375,10 +375,10 @@ namespace Crow.Text { base.onDraw (gr); - gr.SelectFontFace (Font.Name, Font.Slant, Font.Wheight); - gr.SetFontSize (Font.Size); - gr.FontOptions = Interface.FontRenderingOptions; - gr.Antialias = Interface.Antialias; + gr.FontFace = Font.Name; + gr.FontSize = (uint)Font.Size; + //gr.FontOptions = Interface.FontRenderingOptions; + //gr.Antialias = Interface.Antialias; Rectangle cb = ClientRectangle; @@ -452,12 +452,12 @@ namespace Crow.Text public override void onMouseEnter (object sender, MouseMoveEventArgs e) { base.onMouseEnter (sender, e); - IFace.MouseCursor = MouseCursors.Text; + IFace.MouseCursor = MouseCursor.IBeam; } public override void onMouseLeave (object sender, MouseMoveEventArgs e) { base.onMouseLeave (sender, e); - IFace.MouseCursor = MouseCursors.Default; + IFace.MouseCursor = MouseCursor.Arrow; } public override void onMouseMove (object sender, MouseMoveEventArgs e) { @@ -542,11 +542,9 @@ namespace Crow.Text switch (key) { - case Key.BackSpace: + case Key.Backspace: buffer.Delete (); break; - case Key.Clear: - break; case Key.Delete: if (buffer.SelectionIsEmpty) buffer.MoveRight (); @@ -554,8 +552,8 @@ namespace Crow.Text // IFace.Clipboard = buffer.SelectedText; buffer.Delete (); break; - case Key.ISO_Enter: - case Key.KP_Enter: + case Key.Enter: + case Key.KeypadEnter: if (!buffer.SelectionIsEmpty) buffer.Delete (); buffer.InsertLineBreak (); @@ -657,9 +655,9 @@ namespace Crow.Text break; case Key.Menu: break; - case Key.Num_Lock: + case Key.NumLock: break; - case Key.Page_Down: + case Key.PageDown: if (IFace.Shift) { if (buffer.SelectionIsEmpty) buffer.SetSelStartPos (); @@ -670,7 +668,7 @@ namespace Crow.Text buffer.ResetSelection (); CurrentLine += visibleLines; break; - case Key.Page_Up: + case Key.PageUp: if (IFace.Shift) { if (buffer.SelectionIsEmpty) buffer.SetSelStartPos (); diff --git a/Samples/CrowIDE/src/Editors/ImlVisualEditor.cs b/Samples/CrowIDE/src/Editors/ImlVisualEditor.cs index c656b7ac..75d8206b 100644 --- a/Samples/CrowIDE/src/Editors/ImlVisualEditor.cs +++ b/Samples/CrowIDE/src/Editors/ImlVisualEditor.cs @@ -446,6 +446,7 @@ namespace Crow.Coding Rectangle hr; + /* if (SelectedItem?.Parent != null) { gr.SelectFontFace (Font.Name, Font.Slant, Font.Wheight); @@ -491,7 +492,7 @@ namespace Crow.Coding //drawIcon (gr, icoStyle, rIcoStyle); } - } + }*/ if (HoverWidget != null) { hr = HoverWidget.ScreenCoordinates (HoverWidget.getSlot ()); gr.SetSourceColor (Color.SkyBlue); @@ -501,7 +502,7 @@ namespace Crow.Coding gr.Restore (); } - void drawIcon (Context gr, Picture pic, Rectangle r) { + void drawIcon (Context gr, Picture pic, Rectangle r) {/* // gr.SetSourceColor (Color.Black); // CairoHelpers.CairoRectangle (gr, r.Inflated (1), 2, 1.0); gr.SetSourceColor (Color.White); @@ -509,9 +510,10 @@ namespace Crow.Coding gr.Fill (); gr.Operator = Operator.Clear; pic.Paint (gr, r); - gr.Operator = Operator.Over; + gr.Operator = Operator.Over;*/ } void drawDesignOverlay (Context gr, Widget g, Rectangle cb, Rectangle hr, double coteStroke, double space = 6.5){ + /* double z = zoom / 100.0; double coteW = 3, coteL = 5; bool fill = true; @@ -561,7 +563,8 @@ namespace Crow.Coding //gr.SetSourceColor (Color.Grey); // gr.Rectangle (hr,coteStroke); // gr.Stroke (); - gr.Operator = Operator.Over; + gr.Operator = Operator.Over; + */ } void drawCenteredTextLine (Context gr, Point center, string txt){ diff --git a/Samples/CrowIDE/src/Editors/SourceEditor.cs b/Samples/CrowIDE/src/Editors/SourceEditor.cs index 386ce463..ca55ee09 100644 --- a/Samples/CrowIDE/src/Editors/SourceEditor.cs +++ b/Samples/CrowIDE/src/Editors/SourceEditor.cs @@ -606,10 +606,10 @@ namespace Crow.Coding gr.LineTo (rFld.Center.X + 0.5 + foldSize / 2, y + fe.Ascent / 2 + 0.5); closingNode = false; } - gr.SetDash (new double[]{ 1.5 },0.0); + //gr.SetDash (new double[]{ 1.5 },0.0); gr.SetSourceColor (Color.Grey); gr.Stroke (); - gr.SetDash (new double[]{}, 0.0); + //gr.SetDash (new double[]{}, 0.0); if (cl.IsFoldable) { gr.Rectangle (rFld); @@ -742,7 +742,7 @@ namespace Crow.Coding fts = FontSlant.Italic; } - gr.SelectFontFace (Font.Name, fts, ftw); + gr.FontFace = Font.Name; gr.SetSourceColor (fg); gr.MoveTo (x, y + fe.Ascent); @@ -790,7 +790,7 @@ namespace Crow.Coding get { return base.Font; } set { base.Font = value; - + /* using (ImageSurface img = new ImageSurface (Format.Argb32, 1, 1)) { using (Context gr = new Context (img)) { gr.SelectFontFace (Font.Name, Font.Slant, Font.Wheight); @@ -798,7 +798,7 @@ namespace Crow.Coding fe = gr.FontExtents; } - } + }*/ MaxScrollY = 0; RegisterForGraphicUpdate (); } @@ -824,10 +824,8 @@ namespace Crow.Coding { base.onDraw (gr); - gr.SelectFontFace (Font.Name, Font.Slant, Font.Wheight); - gr.SetFontSize (Font.Size); - gr.FontOptions = Interface.FontRenderingOptions; - gr.Antialias = Interface.Antialias; + gr.FontFace = Font.Name; + gr.FontSize = (uint)Font.Size; Rectangle cb = ClientRectangle; @@ -919,14 +917,14 @@ namespace Crow.Coding { base.onMouseEnter (sender, e); if (e.X - ScreenCoordinates(Slot).X < leftMargin + ClientRectangle.X) - IFace.MouseCursor = MouseCursors.Default; + IFace.MouseCursor = MouseCursor.Arrow; else - IFace.MouseCursor = MouseCursors.Text; + IFace.MouseCursor = MouseCursor.IBeam; } public override void onMouseLeave (object sender, MouseMoveEventArgs e) { base.onMouseLeave (sender, e); - IFace.MouseCursor = MouseCursors.Default; + IFace.MouseCursor = MouseCursor.Arrow; } public override void onMouseMove (object sender, MouseMoveEventArgs e) { @@ -938,9 +936,9 @@ namespace Crow.Coding if (!e.Mouse.IsButtonDown (MouseButton.Left)) { if (mouseLocalPos.X < leftMargin) - IFace.MouseCursor = MouseCursors.Default; + IFace.MouseCursor = MouseCursor.Arrow; else - IFace.MouseCursor = MouseCursors.Text; + IFace.MouseCursor = MouseCursor.IBeam; return; } @@ -1032,11 +1030,9 @@ namespace Crow.Coding switch (key) { - case Key.BackSpace: + case Key.Backspace: buffer.DeleteChar (); break; - case Key.Clear: - break; case Key.Delete: if (buffer.SelectionIsEmpty) MoveRight (); @@ -1044,8 +1040,8 @@ namespace Crow.Coding IFace.Clipboard = buffer.SelectedText; buffer.DeleteChar (); break; - case Key.Return: - case Key.KP_Enter: + case Key.Enter: + case Key.KeypadEnter: if (!buffer.SelectionIsEmpty) buffer.DeleteChar (); buffer.InsertLineBreak (); @@ -1147,9 +1143,9 @@ namespace Crow.Coding break; case Key.Menu: break; - case Key.Num_Lock: + case Key.NumLock: break; - case Key.Page_Down: + case Key.PageDown: if (IFace.Shift) { if (buffer.SelectionIsEmpty) buffer.SetSelStartPos (); @@ -1160,7 +1156,7 @@ namespace Crow.Coding buffer.ResetSelection (); PrintedCurrentLine += visibleLines; break; - case Key.Page_Up: + case Key.PageUp: if (IFace.Shift) { if (buffer.SelectionIsEmpty) buffer.SetSelStartPos (); diff --git a/Samples/CrowIDE/src/GraphicObjectDesignContainer.cs b/Samples/CrowIDE/src/GraphicObjectDesignContainer.cs index 650d2ba7..166181d8 100644 --- a/Samples/CrowIDE/src/GraphicObjectDesignContainer.cs +++ b/Samples/CrowIDE/src/GraphicObjectDesignContainer.cs @@ -47,6 +47,7 @@ namespace Crow.Coding } void onStartDrag (object sender, EventArgs e) { + /* Widget go = sender as Widget; lock (go.IFace.UpdateMutex) { @@ -65,7 +66,7 @@ namespace Crow.Coding } go.IFace.DragImage = img; - } + }*/ } void onEndDrag (object sender, DragDropEventArgs e) { diff --git a/Samples/common/ui/Interfaces/TemplatedContainer/testPopper.crow b/Samples/common/ui/Interfaces/TemplatedContainer/testPopper.crow index 27da8ea4..beac8734 100755 --- a/Samples/common/ui/Interfaces/TemplatedContainer/testPopper.crow +++ b/Samples/common/ui/Interfaces/TemplatedContainer/testPopper.crow @@ -11,7 +11,7 @@ - + diff --git a/Samples/common/ui/Interfaces/TemplatedControl/testSpinner.crow b/Samples/common/ui/Interfaces/TemplatedControl/testSpinner.crow index 01d53016..bff7eab9 100755 --- a/Samples/common/ui/Interfaces/TemplatedControl/testSpinner.crow +++ b/Samples/common/ui/Interfaces/TemplatedControl/testSpinner.crow @@ -4,7 +4,7 @@ - + \ No newline at end of file -- 2.47.3