From 616e26d066c2986e02889fa1aa95f69c9334f86f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Fri, 29 Mar 2019 17:11:58 +0100 Subject: [PATCH] fix mouse move error when no iml is loaded --- .gitignore | 1 + Crow.OpenTK.nuspec | 23 ++------------------ Crow.csproj | 8 +++---- CrowIDE/CrowIDE.csproj | 25 ++------------------- CrowIDE/src/CrowIDE.cs | 2 +- Tests/CrowWindow.cs | 8 ++++--- Tests/Tests.csproj | 49 ++---------------------------------------- 7 files changed, 16 insertions(+), 100 deletions(-) diff --git a/.gitignore b/.gitignore index 477bac00..28eaade6 100644 --- 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 845f6556..d07d792d 100644 --- a/Crow.OpenTK.nuspec +++ b/Crow.OpenTK.nuspec @@ -2,7 +2,7 @@ Crow.OpenTK - 0.7.1 + 0.7.2 C# Rapid Open Widget Toolkit JP Bruyere Grand Tetras Software @@ -18,27 +18,8 @@ Crow.OpenTK is the OpenTK ready version. -- 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. - - Copyright 2013-2018 + Copyright 2013-2019 diff --git a/Crow.csproj b/Crow.csproj index 1b5b3406..f87641b9 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -24,20 +24,18 @@ crow.key 8.0.30703 2.0 - 0.5 + 0.7.2 true full true - false - $(SolutionDir)build\Debug + false DESIGN_MODE;DEBUG_UPDATE0;DEBUG_FOCUS0;DEBUG_DISPOSE0;DEBUG_LAYOUTING0;TRACE0;DEBUG;MEASURE_TIME;DEBUG_LOAD0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0 true - DESIGN_MODE - $(SolutionDir)build\Release + DESIGN_MODE diff --git a/CrowIDE/CrowIDE.csproj b/CrowIDE/CrowIDE.csproj index 1cae7289..e6e0092e 100644 --- a/CrowIDE/CrowIDE.csproj +++ b/CrowIDE/CrowIDE.csproj @@ -12,12 +12,7 @@ v4.5 $(SolutionDir)build/$(Configuration) $(SolutionDir)build/obj/$(Configuration) - - - - - - 0.5 + 0.7.2 Crow.Coding.CrowIDE @@ -28,8 +23,6 @@ prompt 4 false - $(SolutionDir)build\obj\$(Configuration) - $(SolutionDir)build\$(Configuration) none @@ -37,21 +30,7 @@ prompt 0 false - $(SolutionDir)build\obj\$(Configuration) - $(SolutionDir)build\$(Configuration) - - - Program - %24{TargetName} - %24{SolutionDir}\build\%24{ProjectConfigName} - false - - - Program - %24{TargetName} - %24{SolutionDir}\build\%24{ProjectConfigName} - false - + diff --git a/CrowIDE/src/CrowIDE.cs b/CrowIDE/src/CrowIDE.cs index 46a926e3..4d11b420 100644 --- 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 1be9bb45..862a81b2 100644 --- 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 c86ff9cb..5d84473d 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -11,14 +11,9 @@ Tests.BasicTests v4.5 AnyCPU - 0.5 + 0.7.2 $(SolutionDir)build/$(Configuration) $(SolutionDir)build/obj/$(Configuration) - - - - - true @@ -28,53 +23,13 @@ 4 false DEBUG;TRACE;MEASURE_TIME - $(SolutionDir)build\obj\$(Configuration) - $(SolutionDir)build\Debug none true 0 false - $(SolutionDir)build\obj\$(Configuration) - $(SolutionDir)build\Release - - - Program - %24{TargetName} - %24{SolutionDir}\build\%24{ProjectConfigName} - false - - - Program - %24{TargetName} - %24{SolutionDir}\build\%24{ProjectConfigName} - false - - - Program - %24{TargetName} - %24{SolutionDir}\build\%24{ProjectConfigName} - false - - - Program - %24{TargetName} - %24{SolutionDir}\build\%24{ProjectConfigName} - false - - - Program - %24{TargetName} - %24{SolutionDir}\build\%24{ProjectConfigName} - false - - - Program - %24{TargetName} - %24{SolutionDir}\build\%24{ProjectConfigName} - false - + -- 2.47.3