Skip to content

Commit

Permalink
gui: drop macOS ForceActivation workaround
Browse files Browse the repository at this point in the history
Discussion in #16720 seems to point to this being no-longer needed after
qt 5.6+. We now required 5.11.x+.
  • Loading branch information
fanquake committed Jun 30, 2023
1 parent 6744d84 commit 362e989
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
5 changes: 0 additions & 5 deletions src/qt/guiutil.cpp
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
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];
}

0 comments on commit 362e989

Please sign in to comment.