strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#162190 handle Command-w

Browse source 
On macOS, Command-w should attempt to close the key window.

Also, pressing Command-m would fail to close the key window
due to the same cause as tdf#162010 if the resulting key
event was an input method event.

Change-Id: I0d90547d7a0833bcc18b36f6d888e1065e91ec57
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171086
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Patrick Luby 2024-07-25 21:09:34 -04:00 committed by Patrick Luby
parent 4be345abd6
commit b147debad0
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
vcl/osx/vclnsapp.mm
View file

@ -109,24 +109,49 @@
[static_cast<SalFrameWindow*>(pKeyWin) endExtTextInput];
AquaSalFrame* pFrame = [static_cast<SalFrameWindow*>(pKeyWin) getSalFrame];
unsigned int nModMask = ([pEvent modifierFlags] & (NSEventModifierFlagShift|NSEventModifierFlagControl|NSEventModifierFlagOption|NSEventModifierFlagCommand));
// Related tdf#162010: match against -[NSEvent characters]
// When using some non-Western European keyboard layouts, the
// event's "characters ignoring modifiers" will be set to the
// original Unicode character instead of the resolved key
// equivalent character so match against the -[NSEvent characters]
// instead.
NSEventModifierFlags nModMask = ([pEvent modifierFlags] & (NSEventModifierFlagShift|NSEventModifierFlagControl|NSEventModifierFlagOption|NSEventModifierFlagCommand));
// Note: when pressing Command-Option keys, some non-Western
// keyboards will set the "characters ignoring modifiers"
// property to the key shortcut character instead of setting
// the "characters property. So check for both cases.
NSString *pCharacters = [pEvent characters];
NSString *pCharactersIgnoringModifiers = [pEvent charactersIgnoringModifiers];
/*
* #i98949# - Cmd-M miniaturize window, Cmd-Option-M miniaturize all windows
*/
if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"m"] )
if( [pCharacters isEqualToString: @"m"] || [pCharactersIgnoringModifiers isEqualToString: @"m"] )
{
if ( nModMask == NSEventModifierFlagCommand && ([pFrame->getNSWindow() styleMask] & NSWindowStyleMaskMiniaturizable) )
{
[pFrame->getNSWindow() performMiniaturize: nil];
return;
}
if ( nModMask == ( NSEventModifierFlagCommand | NSEventModifierFlagOption ) )
else if ( nModMask == ( NSEventModifierFlagCommand | NSEventModifierFlagOption ) )
{
[NSApp miniaturizeAll: nil];
return;
}
}
// tdf#162190 handle Command-w
// On macOS, Command-w should attempt to close the key window.
// TODO: Command-Option-w should attempt to close all windows.
else if( [pCharacters isEqualToString: @"w"] || [pCharactersIgnoringModifiers isEqualToString: @"w"] )
{
if ( nModMask == NSEventModifierFlagCommand && ([pFrame->getNSWindow() styleMask] & NSWindowStyleMaskClosable ) )
{
[pFrame->getNSWindow() performClose: nil];
return;
}
}
// get information whether the event was handled; keyDown returns nothing
GetSalData()->maKeyEventAnswer[ pEvent ] = false;