Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Win32: Fix handling of subsequent keypress after Alt/F10 #6597

Merged
merged 2 commits into from
Sep 22, 2021
Merged

Win32: Fix handling of subsequent keypress after Alt/F10 #6597

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d54cd3
Disable win32 handling of Alt/F10 keys.
grokys Sep 15, 2021
b3fe96d
Merge branch 'master' into fixes/6592-win32-alt-f10
Gillibald Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,31 @@ public enum MenuCharParam
MNC_SELECT = 3
}

public enum SysCommands
{
SC_SIZE = 0xF000,
SC_MOVE = 0xF010,
SC_MINIMIZE = 0xF020,
SC_MAXIMIZE = 0xF030,
SC_NEXTWINDOW = 0xF040,
SC_PREVWINDOW = 0xF050,
SC_CLOSE = 0xF060,
SC_VSCROLL = 0xF070,
SC_HSCROLL = 0xF080,
SC_MOUSEMENU = 0xF090,
SC_KEYMENU = 0xF100,
SC_ARRANGE = 0xF110,
SC_RESTORE = 0xF120,
SC_TASKLIST = 0xF130,
SC_SCREENSAVE = 0xF140,
SC_HOTKEY = 0xF150,
SC_DEFAULT = 0xF160,
SC_MONITORPOWER = 0xF170,
SC_CONTEXTHELP = 0xF180,
SC_SEPARATOR = 0xF00F,
SCF_ISSECURE = 0x00000001,
}

[StructLayout(LayoutKind.Sequential)]
public struct RGBQUAD
{
Expand Down
6 changes: 6 additions & 0 deletions src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam,
break;
}

case WindowsMessage.WM_SYSCOMMAND:
// Disable system handling of Alt/F10 menu keys.
if ((SysCommands)wParam == SysCommands.SC_KEYMENU && HighWord(ToInt32(lParam)) <= 0)
return IntPtr.Zero;
break;

case WindowsMessage.WM_MENUCHAR:
{
// mute the system beep
Expand Down