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

Drop macOS ForceActivation workaround #744

Closed
wants to merge 1 commit into from
Closed

Drop macOS ForceActivation workaround #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions src/qt/guiutil.cpp
View file
Open in desktop
Expand Up @@ -80,7 +80,6 @@

#include <QProcess>

void ForceActivation();
#endif

using namespace std::chrono_literals;
Expand Down Expand Up @@ -400,10 +399,6 @@ bool isObscured(QWidget *w)

void bringToFront(QWidget* w)
{
#ifdef Q_OS_MACOS
ForceActivation();
#endif

if (w) {
// activateWindow() (sometimes) helps with keyboard focus on Windows
if (w->isMinimized()) {
Expand Down
10 changes: 0 additions & 10 deletions src/qt/macdockiconhandler.mm
View file
Open in desktop
Expand Up @@ -41,13 +41,3 @@ void setupDockClickHandler() {
{
delete s_instance;
}

/**
* Force application activation on macOS. With Qt 5.5.1 this is required when
* an action in the Dock menu is triggered.
* TODO: Define a Qt version where it's no-longer necessary.
*/
void ForceActivation()
{
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
}