macOS: Fix "on top" windows missing from Mission Control / Exposé

jdpurcell · Jan 4, 2025 · 03202ac · 03202ac
1 parent fe52bb5
commit 03202ac
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1412,6 +1412,11 @@ void MainWindow::toggleWindowOnTop()
     for (const auto &action : qvApp->getActionManager().getAllClonesOfAction("windowontop", this))
        action->setChecked(targetValue);
 
+#ifdef COCOA_LOADED
+    // Make sure window still participates in Mission Control
+    QVCocoaFunctions::setWindowCollectionBehaviorManaged(this);
+#endif
+
     emit qvApp->windowOnTopChanged();
 }
 

diff --git a/src/qvcocoafunctions.h b/src/qvcocoafunctions.h
@@ -19,6 +19,8 @@ class QVCocoaFunctions
 
     static void setTitlebarHidden(QWidget *window, const bool hide);
 
+    static void setWindowCollectionBehaviorManaged(QWidget *window);
+
     static void setVibrancy(bool alwaysDark, QWindow *window);
 
     static int getObscuredHeight(QWindow *window);

diff --git a/src/qvcocoafunctions.mm b/src/qvcocoafunctions.mm
@@ -130,6 +130,14 @@ static void fixNativeMenuEccentricities(QMenu *menu, NSMenu *nativeMenu)
     view.window.titleVisibility = hide ? NSWindowTitleHidden : NSWindowTitleVisible;
 }
 
+void QVCocoaFunctions::setWindowCollectionBehaviorManaged(QWidget *window)
+{
+    auto *view = reinterpret_cast<NSView*>(window->winId());
+    view.window.collectionBehavior =
+        (view.window.collectionBehavior | NSWindowCollectionBehaviorManaged) &
+        ~(NSWindowCollectionBehaviorTransient | NSWindowCollectionBehaviorStationary);
+}
+
 void QVCocoaFunctions::setVibrancy(bool alwaysDark, QWindow *window)
 {
     auto *view = reinterpret_cast<NSView*>(window->winId());