diff --git a/Ink Canvas/Helpers/EdgeGestureUtil.cs b/Ink Canvas/Helpers/EdgeGestureUtil.cs new file mode 100644 index 0000000..18eb0c5 --- /dev/null +++ b/Ink Canvas/Helpers/EdgeGestureUtil.cs @@ -0,0 +1,204 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Microsoft.VisualBasic; +using System.Collections; +using System.Data; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; + +namespace Ink_Canvas.Helpers +{ + + public static class EdgeGestureUtil + { + + private static Guid DISABLE_TOUCH_SCREEN = new Guid("32CE38B2-2C9A-41B1-9BC5-B3784394AA44"); + private static Guid IID_PROPERTY_STORE = new Guid("886d8eeb-8cf2-4446-8d02-cdba1dbdcf99"); + + private static short VT_BOOL = 11; + #region "Structures" + + [StructLayout(LayoutKind.Sequential, Pack = 4)] + public struct PropertyKey + { + public PropertyKey(Guid guid, UInt32 pid) + { + fmtid = guid; + this.pid = pid; + } + + [MarshalAs(UnmanagedType.Struct)] + public Guid fmtid; + public uint pid; + } + + [StructLayout(LayoutKind.Explicit)] + public struct PropVariant + { + [FieldOffset(0)] + public short vt; + [FieldOffset(2)] + private short wReserved1; + [FieldOffset(4)] + private short wReserved2; + [FieldOffset(6)] + private short wReserved3; + [FieldOffset(8)] + private sbyte cVal; + [FieldOffset(8)] + private byte bVal; + [FieldOffset(8)] + private short iVal; + [FieldOffset(8)] + public ushort uiVal; + [FieldOffset(8)] + private int lVal; + [FieldOffset(8)] + private uint ulVal; + [FieldOffset(8)] + private int intVal; + [FieldOffset(8)] + private uint uintVal; + [FieldOffset(8)] + private long hVal; + [FieldOffset(8)] + private long uhVal; + [FieldOffset(8)] + private float fltVal; + [FieldOffset(8)] + private double dblVal; + [FieldOffset(8)] + public bool boolVal; + [FieldOffset(8)] + private int scode; + [FieldOffset(8)] + private DateTime date; + [FieldOffset(8)] + private System.Runtime.InteropServices.ComTypes.FILETIME filetime; + + [FieldOffset(8)] + private Blob blobVal; + [FieldOffset(8)] + private IntPtr pwszVal; + + + /// + /// Helper method to gets blob data + /// + private byte[] GetBlob() + { + byte[] Result = new byte[blobVal.Length]; + Marshal.Copy(blobVal.Data, Result, 0, Result.Length); + return Result; + } + + /// + /// Property value + /// + public object Value + { + get + { + VarEnum ve = (VarEnum)vt; + switch (ve) + { + case VarEnum.VT_I1: + return bVal; + case VarEnum.VT_I2: + return iVal; + case VarEnum.VT_I4: + return lVal; + case VarEnum.VT_I8: + return hVal; + case VarEnum.VT_INT: + return iVal; + case VarEnum.VT_UI4: + return ulVal; + case VarEnum.VT_LPWSTR: + return Marshal.PtrToStringUni(pwszVal); + case VarEnum.VT_BLOB: + return GetBlob(); + } + throw new NotImplementedException("PropVariant " + ve.ToString()); + } + } + } + + internal struct Blob + { + public int Length; + + public IntPtr Data; + //Code Should Compile at warning level4 without any warnings, + //However this struct will give us Warning CS0649: Field [Fieldname] + //is never assigned to, and will always have its default value + //You can disable CS0649 in the project options but that will disable + //the warning for the whole project, it's a nice warning and we do want + //it in other places so we make a nice dummy function to keep the compiler + //happy. + private void FixCS0649() + { + Length = 0; + Data = IntPtr.Zero; + } + } + + #endregion + + #region "Interfaces" + + [ComImport(), Guid("886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface IPropertyStore + { + [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)] + void GetCount([Out(), In()] ref uint cProps); + [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)] + void GetAt([In()] uint iProp, ref PropertyKey pkey); + [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)] + void GetValue([In()] ref PropertyKey key, ref PropVariant pv); + [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)] + void SetValue([In()] ref PropertyKey key, [In()] ref PropVariant pv); + [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)] + void Commit(); + [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)] + void Release(); + } + + #endregion + + #region "Methods" + + [DllImport("shell32.dll", SetLastError = true)] + private static extern int SHGetPropertyStoreForWindow(IntPtr handle, ref Guid riid, ref IPropertyStore propertyStore); + + public static void DisableEdgeGestures(IntPtr hwnd, bool enable) + { + IPropertyStore pPropStore = null; + int hr = 0; + hr = SHGetPropertyStoreForWindow(hwnd, ref IID_PROPERTY_STORE, ref pPropStore); + if (hr == 0) + { + PropertyKey propKey = new PropertyKey(); + propKey.fmtid = DISABLE_TOUCH_SCREEN; + propKey.pid = 2; + PropVariant var = new PropVariant(); + var.vt = VT_BOOL; + var.boolVal = enable; + pPropStore.SetValue(ref propKey, ref var); + Marshal.FinalReleaseComObject(pPropStore); + } + } + + #endregion + + } +} diff --git a/Ink Canvas/Helpers/FullScreenHelper.Win32.cs b/Ink Canvas/Helpers/FullScreenHelper.Win32.cs index e7fc95a..fae1dd0 100644 --- a/Ink Canvas/Helpers/FullScreenHelper.Win32.cs +++ b/Ink Canvas/Helpers/FullScreenHelper.Win32.cs @@ -177,6 +177,7 @@ namespace Ink_Canvas.Helpers /// Places the window at the top of the Z order. /// HWND_TOP = 0, + HWND_TOPMOST = -1, } enum DWMWINDOWATTRIBUTE : uint diff --git a/Ink Canvas/Helpers/FullScreenHelper.cs b/Ink Canvas/Helpers/FullScreenHelper.cs index 4a0d5a7..b80a4a3 100644 --- a/Ink Canvas/Helpers/FullScreenHelper.cs +++ b/Ink Canvas/Helpers/FullScreenHelper.cs @@ -95,7 +95,7 @@ namespace Ink_Canvas.Helpers //不能用 placement 的坐标，placement是工作区坐标，不是屏幕坐标。 //使用窗口当前的矩形调用下设置窗口位置和尺寸的方法，让Hook来进行调整窗口位置和尺寸到全屏模式 - Win32.User32.SetWindowPos(hwnd, (IntPtr) HwndZOrder.HWND_TOP, rect.Left, rect.Top, rect.Width, + Win32.User32.SetWindowPos(hwnd, (IntPtr) HwndZOrder.HWND_TOPMOST, rect.Left, rect.Top, rect.Width, rect.Height, (int) WindowPositionFlags.SWP_NOZORDER); } } diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj index ee3839e..0c84422 100644 --- a/Ink Canvas/InkCanvasForClass.csproj +++ b/Ink Canvas/InkCanvasForClass.csproj @@ -138,14 +138,14 @@ - - + + diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index a3c7e8f..6c83594 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -14,17 +14,21 @@ Loaded="Window_Loaded" Background="Transparent" ShowInTaskbar="False" - Title="Ink Canvas for Class" + Title="InkCanvasforClass" Topmost="True" KeyDown="Window_KeyDown" Closing="Window_Closing" Closed="Window_Closed" PreviewKeyDown="Main_Grid_PreviewKeyDown" - Height="7000" Width="1440" + Height="8000" Width="1440" FontFamily="Microsoft YaHei UI" MouseWheel="Window_MouseWheel" Foreground="Black" - Stylus.IsPressAndHoldEnabled="False"> + SizeChanged="MainWindow_OnSizeChanged" + Stylus.IsPressAndHoldEnabled="False" + Stylus.IsFlicksEnabled="False" + Stylus.IsTapFeedbackEnabled="False" + Stylus.IsTouchFeedbackEnabled="False"> @@ -657,7 +661,8 @@ - + - + - + - + + @@ -856,6 +865,106 @@ FontFamily="Microsoft YaHei UI" FontWeight="Bold" Toggled="ToggleSwitchIsSecondConfimeWhenShutdownApp_Toggled" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1569,21 +1678,21 @@