returning to LC via Command+Tab won't always activate a subwindow LibreCAD#821 LibreCAD#814

Author: r-a-v-a-s

librecad/src/main/qc_applicationwindow.cpp

@@ -25,6 +25,7 @@
 **
 **********************************************************************/
 
+
 #include "qc_applicationwindow.h"
 
 #include <QStatusBar>
@@ -128,6 +129,7 @@ QC_ApplicationWindow::QC_ApplicationWindow()
     , ag_manager(new LC_ActionGroupManager(this))
     , autosaveTimer(nullptr)
     , actionHandler(new QG_ActionHandler(this))
+    , current_subwindow(nullptr)
 {
     RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow");
 
@@ -3193,3 +3195,26 @@ void QC_ApplicationWindow::destroyMenu(const QString& menu_name)
     }
     settings.endGroup();
 }
+
+void QC_ApplicationWindow::changeEvent(QEvent* event)
+{
+    // author: ravas
+
+    #if defined(Q_OS_MAC)
+        // returning to LC via Command+Tab won't always activate a subwindow
+        // https://github.com/LibreCAD/LibreCAD/issues/821
+
+        if (event->type() == QEvent::ActivationChange)
+        {
+            if (isActiveWindow())
+            {
+                if (current_subwindow)
+                    mdiAreaCAD->setActiveSubWindow(current_subwindow);
+            }
+            else
+            {
+                current_subwindow = mdiAreaCAD->currentSubWindow();
+            }
+        }
+    #endif
+}

librecad/src/main/qc_applicationwindow.h

@@ -88,7 +88,7 @@ class QC_ApplicationWindow: public MainWindowX
     bool queryExit(bool force);
 
     /** Catch hotkey for giving focus to command line. */
-    virtual void keyPressEvent(QKeyEvent* e);
+    virtual void keyPressEvent(QKeyEvent* e) override;
     void setRedoEnable(bool enable);
     void setUndoEnable(bool enable);
     bool loadStyleSheet(QString path);
@@ -276,15 +276,16 @@ public slots:
     }
 
 protected:
-    void closeEvent(QCloseEvent*);
+    void closeEvent(QCloseEvent*) override;
     //! \{ accept drop files to open
-    virtual void dropEvent(QDropEvent* e);
-    virtual void dragEnterEvent(QDragEnterEvent * event);
+    virtual void dropEvent(QDropEvent* e) override;
+    virtual void dragEnterEvent(QDragEnterEvent * event) override;
+    void changeEvent(QEvent *) override;
     //! \}
 
 private:
 
-    QMenu* createPopupMenu();
+    QMenu* createPopupMenu() override;
 
     QString format_filename_caption(const QString &qstring_in);
     /** Helper function for Menu file -> New & New.... */
@@ -313,6 +314,7 @@ public slots:
     /** MdiArea for MDI */
     QMdiArea* mdiAreaCAD{nullptr};
     QMdiSubWindow* activedMdiSubWindow;
+    QMdiSubWindow* current_subwindow;
 
     /** Dialog factory */
     QC_DialogFactory* dialogFactory;