dont set handled=true for mouseWheen in single line textbox

diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj
index 7004eb0d22cb40b24a385019008497a93c69e0ea..083b19892f7a5ef5571c7f309bd1ddefe547af99 100644 (file)
--- a/Crow/Crow.csproj
+++ b/Crow/Crow.csproj
@@ -43,6 +43,13 @@
                <PackageReference Include="glfw-sharp" Version="$(GlfwSharpVersion)" />
        </ItemGroup>
 
+       <PropertyGroup Condition=" '$(CrowVkvgBackend)' == 'true'">
+               <DefineConstants>$(DefineConstants);VKVG</DefineConstants>
+       </PropertyGroup>
+       <ItemGroup Condition=" '$(CrowVkvgBackend)' == 'true'">
+               <PackageReference Include="vkvg.net" Version="0.2.2-beta" />
+       </ItemGroup>
+
        <PropertyGroup Condition=" '$(CrowStbSharp)' == 'true'">
                <DefineConstants>$(DefineConstants);STB_SHARP</DefineConstants>
        </PropertyGroup>

diff --git a/Crow/Default.style b/Crow/Default.style
index 6440636216ca1a940533471f8006a74dcbdc3270..9f206629069088087a88d5fdc41a6c81d4d1a495 100644 (file)
--- a/Crow/Default.style
+++ b/Crow/Default.style
@@ -302,10 +302,11 @@ TableRow {
 }
 TableHeaderRow {
        Height="Fit";
+       Background="Black";
        Width="Stretched";//TODO:Force it to stretched programmatically
 }
 TableHeaderLabel {
        Margin = "1";
-       Background = "Jet";
+       //Background = "Jet";
        Foreground = "LightGrey";
 }
\ No newline at end of file

diff --git a/Crow/src/Widgets/TextBox.cs b/Crow/src/Widgets/TextBox.cs
index bf1678f47b5b0efa62a9fbb33ef137f764e54e1f..ece9adc06d8f4636ee9f54e88c032b19e7306d27 100644 (file)
--- a/Crow/src/Widgets/TextBox.cs
+++ b/Crow/src/Widgets/TextBox.cs
@@ -134,12 +134,14 @@ namespace Crow
 
                /// <summary> Process scrolling vertically, or if shift is down, vertically </summary>
                public override void onMouseWheel (object sender, MouseWheelEventArgs e) {                      
+                       e.Handled = true;
                        if (IFace.Shift)
                                ScrollX += e.Delta * MouseWheelSpeed;
-                       else
+                       else if (Multiline)
                                ScrollY -= e.Delta * MouseWheelSpeed;
+                       else
+                               e.Handled = false;
                        
-                       e.Handled = true;
                        base.onMouseWheel (sender, e);
                }
         public override void onMouseMove (object sender, MouseMoveEventArgs e) {            

diff --git a/Samples/DebugLogAnalyzer/src/DebugInterfaceWidget.cs b/Samples/DebugLogAnalyzer/src/DebugInterfaceWidget.cs
index 2dba0601ef97f34d61178e812a5b9e60fdcb6885..c8b27d7d834caaeaa869c8ba080c3408dd5e2d7a 100644 (file)
--- a/Samples/DebugLogAnalyzer/src/DebugInterfaceWidget.cs
+++ b/Samples/DebugLogAnalyzer/src/DebugInterfaceWidget.cs
@@ -9,7 +9,6 @@ using System.Runtime.Loader;
 using System.IO;
 using Crow.Cairo;
 using System.Diagnostics;
-using CrowDbgShared;
 using System.Collections.Generic;
 using Crow.DebugLogger;
 using System.Linq;
@@ -34,8 +33,8 @@ namespace Crow
                Func<Key, bool> delKeyDown, delKeyUp;
                Action delResetDirtyState;
                Action delResetDebugger;
-               Action<object, string> delSaveDebugLog;
-               IntPtrGetterDelegate delGetSurfacePointer;
+               Action<object, string> delSaveDebugLog;         
+               Func<IntPtr> delGetSurfacePointer;
                Action<string> delSetSource;
 
                FieldInfo fiDbg_IncludeEvents, fiDbg_DiscardEvents, fiDbg_ConsoleOutput;
@@ -237,7 +236,7 @@ namespace Crow
                                                                                        dbgIFace, dbgIfaceType.GetMethod("OnKeyPress"));
 
 
-                               delGetSurfacePointer = (IntPtrGetterDelegate)Delegate.CreateDelegate(typeof(IntPtrGetterDelegate),
+                               delGetSurfacePointer = (Func<IntPtr>)Delegate.CreateDelegate(typeof(Func<IntPtr>),
                                                                                        dbgIFace, dbgIfaceType.GetProperty("SurfacePointer").GetGetMethod());
                                delSetSource = (Action<string>)Delegate.CreateDelegate(typeof(Action<string>),
                                                                                        dbgIFace, dbgIfaceType.GetProperty("Source").GetSetMethod());   

diff --git a/Samples/dragNdrop/dragNdrop.cs b/Samples/dragNdrop/dragNdrop.cs
index 89785c82e2f6bd7402b74a85624d07cf0cbb4861..2ca413577f722294af24ba40cfbf58c0e53d35cf 100644 (file)
--- a/Samples/dragNdrop/dragNdrop.cs
+++ b/Samples/dragNdrop/dragNdrop.cs
@@ -34,7 +34,7 @@ namespace tests
                 gr.SetSource (e.DragSource.bmp, 0, 0);
                 gr.Paint ();
             }
-                       CreateDragImage (dragImg)            
+                       CreateDragImage (dragImg, r);
             /*lock (UpdateMutex)
                 startGroup.RemoveChild (e.DragSource);*/
         }