dont set handled=true for mouseWheen in single line textbox

5 files changed, 17 insertions, 8 deletions

diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj
index 7004eb0d..083b1989 100644
--- 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 64406362..9f206629 100644
--- 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 bf1678f4..ece9adc0 100644
--- 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 2dba0601..c8b27d7d 100644
--- 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 89785c82..2ca41357 100644
--- 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);*/
         }