Browse Source
Merge pull request #2731 from yatli/master
Win32: mute system beep on alt+key
pull/2740/head
Nikita Tsukanov
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
14 additions and
1 deletions
-
.gitignore
-
src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
-
src/Windows/Avalonia.Win32/WindowImpl.cs
|
|
|
@ -199,9 +199,10 @@ build-intermediate |
|
|
|
obj-Direct2D1/ |
|
|
|
obj-Skia/ |
|
|
|
|
|
|
|
|
|
|
|
################## |
|
|
|
# Vim |
|
|
|
################## |
|
|
|
.vim |
|
|
|
coc-settings.json |
|
|
|
.ccls-cache |
|
|
|
.ccls |
|
|
|
|
|
|
|
@ -608,6 +608,14 @@ namespace Avalonia.Win32.Interop |
|
|
|
GWL_USERDATA = -21 |
|
|
|
} |
|
|
|
|
|
|
|
public enum MenuCharParam |
|
|
|
{ |
|
|
|
MNC_IGNORE = 0, |
|
|
|
MNC_CLOSE = 1, |
|
|
|
MNC_EXECUTE = 2, |
|
|
|
MNC_SELECT = 3 |
|
|
|
} |
|
|
|
|
|
|
|
[StructLayout(LayoutKind.Sequential)] |
|
|
|
public struct RGBQUAD |
|
|
|
{ |
|
|
|
|
|
|
|
@ -514,6 +514,10 @@ namespace Avalonia.Win32 |
|
|
|
KeyInterop.KeyFromVirtualKey(ToInt32(wParam)), WindowsKeyboardDevice.Instance.Modifiers); |
|
|
|
break; |
|
|
|
|
|
|
|
case UnmanagedMethods.WindowsMessage.WM_MENUCHAR: |
|
|
|
// mute the system beep
|
|
|
|
return (IntPtr)((Int32)UnmanagedMethods.MenuCharParam.MNC_CLOSE << 16); |
|
|
|
|
|
|
|
case UnmanagedMethods.WindowsMessage.WM_KEYUP: |
|
|
|
case UnmanagedMethods.WindowsMessage.WM_SYSKEYUP: |
|
|
|
e = new RawKeyEventArgs( |
|
|
|
|
