fix mouse move error when no iml is loaded

diff --git a/.gitignore b/.gitignore
index 477bac00d42662293e5d08f2eee80dc176b4657d..28eaade65917a886ea79906c7ed8e183deb703b2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.vs
 build
 Win_x86
 Crow.userprefs

diff --git a/Crow.OpenTK.nuspec b/Crow.OpenTK.nuspec
index 845f6556281b718276c8cd2d6f87ba0d7dfad12a..d07d792d1dd40264fa167d4a2cf27c68ca3220fd 100644 (file)
--- a/Crow.OpenTK.nuspec
+++ b/Crow.OpenTK.nuspec
@@ -2,7 +2,7 @@
 <package >
        <metadata>
                <id>Crow.OpenTK</id>
-               <version>0.7.1</version>
+               <version>0.7.2</version>
                <title>C# Rapid Open Widget Toolkit</title>
                <authors>JP Bruyere</authors>
                <owners>Grand Tetras Software</owners>
@@ -18,27 +18,8 @@ Crow.OpenTK is the OpenTK ready version.
 
                </summary>
                <releaseNotes>
-- 0.7.1: implement ReaderWriterLock for solving threading problems
-
-- new mouse move handling, improve perf, introduce new recursive method in GraphicObject 'PointIsIn (ref Point p)'
-- new TemplatedGroup architecture: in hierarchical group, TemplatedGroup are no longer required on each node, only a container with 'ItemsContainer' should be provided in ItemTemplates with sub data fetching.
-- Delete and Remove widget differentiation in group.
-- Drag and Drop basics implemented, not fully tested.
-- binding address starting with '/' start search at current node, not in template.
-- Fit measure units changed from Pixel to Percent.
-- prevent mouse evt on label not selectable.
-- crowIDE wip, need CrowEdit reference (available on GitHub).
-- CheckBox reused as base in several template which need 2 states inherited from it.
-- FocusParent internal variable, allow easyer popup parenting while keeping logical parenting usefull for other things.
-- InstantiatorException with file name.
-- load all assemblies in bin dir at startup to allow usage of several Widget assemblies.
-- Context menu basic mechanic, may be improved.
-- ObservableList that could be used as data source for TempletedGroups.
-- Configuration no longer static to allow multiple config files handling in single application.
-- styling is no longer static in iface to allow different styling context between ifaces.
-
                </releaseNotes>
-               <copyright>Copyright 2013-2018</copyright>
+               <copyright>Copyright 2013-2019</copyright>
                <dependencies>
                        <dependency id="OpenTK" version="2.0.0" />
                </dependencies>

diff --git a/Crow.csproj b/Crow.csproj
index 1b5b3406bf82884fd9a7d1531c6027a3043bc311..f87641b9454e9078d924bacb1e53cfa74c7fed20 100644 (file)
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -24,20 +24,18 @@
     <AssemblyOriginatorKeyFile>crow.key</AssemblyOriginatorKeyFile>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ReleaseVersion>0.5</ReleaseVersion>
+    <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)build\Debug</OutputPath>
+    <Optimize>false</Optimize>    
     <DefineConstants>DESIGN_MODE;DEBUG_UPDATE0;DEBUG_FOCUS0;DEBUG_DISPOSE0;DEBUG_LAYOUTING0;TRACE0;DEBUG;MEASURE_TIME;DEBUG_LOAD0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
-    <DefineConstants>DESIGN_MODE</DefineConstants>
-    <OutputPath>$(SolutionDir)build\Release</OutputPath>
+    <DefineConstants>DESIGN_MODE</DefineConstants>    
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\Colors.cs" />

diff --git a/CrowIDE/CrowIDE.csproj b/CrowIDE/CrowIDE.csproj
index 1cae7289c95a09b3ad0899e9c7a0ef6902841203..e6e0092e5b37d39f5f475233ad2e6e4fabe1df02 100644 (file)
--- a/CrowIDE/CrowIDE.csproj
+++ b/CrowIDE/CrowIDE.csproj
@@ -12,12 +12,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>$(SolutionDir)build/$(Configuration)</OutputPath>
     <IntermediateOutputPath>$(SolutionDir)build/obj/$(Configuration)</IntermediateOutputPath>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="Execute" command="${TargetName}" workingdir="${SolutionDir}/build/${ProjectConfigName}" />
-      </CustomCommands>
-    </CustomCommands>
-    <ReleaseVersion>0.5</ReleaseVersion>
+    <ReleaseVersion>0.7.2</ReleaseVersion>
     <StartupObject>Crow.Coding.CrowIDE</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -28,8 +23,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)</IntermediateOutputPath>
-    <OutputPath>$(SolutionDir)build\$(Configuration)</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -37,21 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)</IntermediateOutputPath>
-    <OutputPath>$(SolutionDir)build\$(Configuration)</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>%24{TargetName}</StartProgram>
-    <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Custom Command' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>%24{TargetName}</StartProgram>
-    <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
+  </PropertyGroup>  
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />

diff --git a/CrowIDE/src/CrowIDE.cs b/CrowIDE/src/CrowIDE.cs
index 46a926e348b73211cbc1a4344227831e321975c2..4d11b42084b7f6831f5ba03d0c5fc64c630bc657 100644 (file)
--- a/CrowIDE/src/CrowIDE.cs
+++ b/CrowIDE/src/CrowIDE.cs
@@ -140,7 +140,7 @@ namespace Crow.Coding
                        MainIFace = ifaceControl[0].CrowInterface;
 
                        mainDock = go.FindByName ("mainDock") as DockStack;
-
+                       ReopenLastSolution = false;
                        if (ReopenLastSolution && !string.IsNullOrEmpty (LastOpenSolution)) {
                                CurrentSolution = Solution.LoadSolution (LastOpenSolution);
                                //lock(MainIFace.UpdateMutex)

diff --git a/Tests/CrowWindow.cs b/Tests/CrowWindow.cs
index 1be9bb45ea3f8b0edc00041534264d17b3d5e290..862a81b215d16455cfe8abc608d512eda5113b08 100644 (file)
--- a/Tests/CrowWindow.cs
+++ b/Tests/CrowWindow.cs
@@ -350,9 +350,11 @@ namespace Crow
                                                return;
                                        }
                                }
-                       } if (ifaceControl [focusedIdx].ProcessMouseMove (otk_e.X, otk_e.Y))
-                               return;                 
-
+                       }
+                       if (focusedIdx >= 0) {
+                               if (ifaceControl [focusedIdx].ProcessMouseMove (otk_e.X, otk_e.Y))
+                                       return;
+                       }
                        CrowMouseMove.Raise (sender, otk_e);
         }
                protected virtual void GL_Mouse_ButtonUp(object sender, OpenTK.Input.MouseButtonEventArgs otk_e)

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index c86ff9cb203835ef88bdc57effb1bf92cb111a43..5d84473d73fae0c0aaef451e4e13de4fe29db0cb 100644 (file)
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -11,14 +11,9 @@
     <StartupObject>Tests.BasicTests</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReleaseVersion>0.5</ReleaseVersion>
+    <ReleaseVersion>0.7.2</ReleaseVersion>
     <OutputPath>$(SolutionDir)build/$(Configuration)</OutputPath>
     <IntermediateOutputPath>$(SolutionDir)build/obj/$(Configuration)</IntermediateOutputPath>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="Execute" command="${TargetName}" workingdir="${SolutionDir}/build/${ProjectConfigName}" />
-      </CustomCommands>
-    </CustomCommands>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -28,53 +23,13 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <DefineConstants>DEBUG;TRACE;MEASURE_TIME</DefineConstants>
-    <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)</IntermediateOutputPath>
-    <OutputPath>$(SolutionDir)build\Debug</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <WarningLevel>0</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)</IntermediateOutputPath>
-    <OutputPath>$(SolutionDir)build\Release</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>%24{TargetName}</StartProgram>
-    <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Custom Command' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>%24{TargetName}</StartProgram>
-    <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Custom Command' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>%24{TargetName}</StartProgram>
-    <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Custom Command' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>%24{TargetName}</StartProgram>
-    <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Custom Command' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>%24{TargetName}</StartProgram>
-    <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Custom Command' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>%24{TargetName}</StartProgram>
-    <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
+  </PropertyGroup>  
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />