update CrowIDE

diff --git a/Crow/src/GraphicObjects/Widget.cs b/Crow/src/GraphicObjects/Widget.cs
index 0f8f18057e98fb93946a9667d0987f46041b691b..c302a411c75c30c3872659a8787493b0de1b6b01 100644 (file)
--- 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 a78a55e832e387e0c20480667323659b1487c113..6670a8ede320f457bc31503a74e4d59f2864b460 100644 (file)
--- a/Samples/CrowIDE/CrowIDE.csproj
+++ b/Samples/CrowIDE/CrowIDE.csproj
@@ -20,7 +20,7 @@
   
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="System" />
-    <PackageReference Include="CVKL" Version="0.1.3.2-beta" />
+    <PackageReference Include="CVKL" Version="0.1.5-beta" />
     <ProjectReference Include="..\..\Crow\Crow.csproj" />
   </ItemGroup>    
         
@@ -29,7 +29,7 @@
     <Compile Include="src\**\*.cs" Exclude="src\ProjectTree\CSProjectFile.cs" />  
     <EmbeddedResource Remove="icons\blank-file2.svg" />
     <EmbeddedResource Include="icons\*.*">
-      <LogicalName>icons.%(Filename)%(Extension)</LogicalName>
+      <LogicalName>CrowIDE.icons.%(Filename)%(Extension)</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="ui\**\*.crow" />
     <EmbeddedResource Include="ui\**\*.itemp" />  

diff --git a/Samples/CrowIDE/src/CrowIDE.cs b/Samples/CrowIDE/src/CrowIDE.cs
index bf29e08a1faf5160c37a10d12e6bb7188f3983f8..1b6ed1517bba48ffabbe4834924b148651218387 100644 (file)
--- 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 d5c41ec49bf58f8331addbedd9ba708e08a59a30..8b16b9a89f3ecdd57d62ec1903b8cf0643155e43 100644 (file)
--- 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 c656b7ac97cf98401043919220a4210d9edb5fec..75d8206b9256f8e0ec4c40cd696b85b02982dfee 100644 (file)
--- 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 386ce4632dffa073cd6d05d37b9896c8b1ab588e..ca55ee09c7670877079360d322dbab1ceb668306 100644 (file)
--- 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 650d2ba7b0616685dc1a6b6958b12d695cab2bba..166181d86602ba36c0408e04c6e2e101253c7d48 100644 (file)
--- 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 27da8ea43f5a04e382a3271ef56c06e226f6a2d2..beac87341307b003aec6d1ba205b22d1e5f246b6 100755 (executable)
--- a/Samples/common/ui/Interfaces/TemplatedContainer/testPopper.crow
+++ b/Samples/common/ui/Interfaces/TemplatedContainer/testPopper.crow
@@ -11,7 +11,7 @@
        <Widget Height="200"/>
        <Popper Caption="TestPopper" Width="100" Background="DimGrey" PopDirection="{alignment}">
                <Border Fit="True" Background="SteelBlue">
-                       <Image Fit="true" Path="#go.Images.Icons.tetra.png" Margin="10"/>
+                       <Image Fit="true" Path="#Crow.Icons.crow.svg" Margin="10"/>
                        <VerticalStack Fit="true" Margin="10" Background="CornflowerBlue">
                                <CheckBox Name="chk1" Background="Red"/>
                                <CheckBox Name="chk2" IsChecked="true"/>

diff --git a/Samples/common/ui/Interfaces/TemplatedControl/testSpinner.crow b/Samples/common/ui/Interfaces/TemplatedControl/testSpinner.crow
index 01d53016e34a18edeb025281ceea778bacb4d79c..bff7eab949da327f56f98788006f1fbf2a5bba7f 100755 (executable)
--- a/Samples/common/ui/Interfaces/TemplatedControl/testSpinner.crow
+++ b/Samples/common/ui/Interfaces/TemplatedControl/testSpinner.crow
@@ -4,7 +4,7 @@
 
        <HorizontalStack Fit="true" Margin="5" Background="SkyBlue">
                <Spinner Name="sp1" Value="5" ValueChanged="onSpinnerValueChange"/>
-               <Spinner Value="5"/>
+               <Spinner Value="5" Width="60"/>
                <Spinner Value="5"/>
        </HorizontalStack>
 </VerticalStack>
\ No newline at end of file