smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: macOS correctly restore window when hidden with command+H

Browse source
This commit is contained in:
sithlord48 2024-12-17 20:45:22 -05:00 committed by Chris Rizzitello
parent bf4f513d7e
commit e4ecbdae8a
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/src/MainWindow.cpp
View file

@ -1055,6 +1055,9 @@ void MainWindow::enableClient(bool enable)
void MainWindow::showAndActivate() void MainWindow::showAndActivate()
{ {
#ifdef Q_OS_MAC
forceAppActive();
#endif
show(); show();
raise(); raise();
activateWindow(); activateWindow();

1
src/lib/gui/OSXHelpers.h
View file

@ -30,4 +30,5 @@ void requestOSXNotificationPermission();
bool isOSXDevelopmentBuild(); bool isOSXDevelopmentBuild();
bool showOSXNotification(const QString &title, const QString &body); bool showOSXNotification(const QString &title, const QString &body);
bool isOSXInterfaceStyleDark(); bool isOSXInterfaceStyleDark();
void forceAppActive();
IconsTheme getOSXIconsTheme(); IconsTheme getOSXIconsTheme();

5
src/lib/gui/OSXHelpers.mm
View file

@ -107,6 +107,11 @@ bool isOSXInterfaceStyleDark()
return (style && [style isKindOfClass:[NSString class]] && NSOrderedSame == [style caseInsensitiveCompare:@"dark"]); return (style && [style isKindOfClass:[NSString class]] && NSOrderedSame == [style caseInsensitiveCompare:@"dark"]);
} }
void forceAppActive()
{
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
}
IconsTheme getOSXIconsTheme() IconsTheme getOSXIconsTheme()
{ {
if (@available(macOS 11, *)) if (@available(macOS 11, *))