Fix touch bar on macOS

theCheeseboard · Dec 1, 2024 · 31f2feb · 31f2feb
1 parent 0e022df
commit 31f2feb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/plugins/MacIntegration/mainwindowtouchbar-objc.mm b/plugins/MacIntegration/mainwindowtouchbar-objc.mm
@@ -40,7 +40,7 @@ @interface MainWindowTouchBarProvider: NSResponder <NSTouchBarDelegate, NSApplic
 
 @property (strong) NSObject *qtDelegate;
 @property QObject *parentQObject;
-@property QWidget *mainWindow;
+@property QQuickWindow *mainWindow;
 //@property Ui::MainWindow *mainWindowUi;
 @property QList<TouchBarItemPtr> touchBarActionMapping;
 
@@ -53,7 +53,7 @@ @interface MainWindowTouchBarProvider: NSResponder <NSTouchBarDelegate, NSApplic
 
 @implementation MainWindowTouchBarProvider
 
-- (id)init: (QWidget*)mainWin  {
+- (id)init: (QQuickWindow*)mainWin  {
     if (self = [super init]) {
         self.parentQObject = new QObject();
 

diff --git a/plugins/MacIntegration/mainwindowtouchbar.cpp b/plugins/MacIntegration/mainwindowtouchbar.cpp
@@ -1,7 +1,7 @@
 #include "mainwindowtouchbar.h"
 #include "mainwindowtouchbar_p.h"
 
-MainWindowTouchBar::MainWindowTouchBar(QWidget *parent) : QObject(parent)
+MainWindowTouchBar::MainWindowTouchBar(QQuickWindow *parent) : QObject(parent)
 {
     d = new MainWindowTouchBarPrivate();
     d->parentWidget = parent;

diff --git a/plugins/MacIntegration/mainwindowtouchbar.h b/plugins/MacIntegration/mainwindowtouchbar.h
@@ -2,13 +2,13 @@
 #define MAINWINDOWTOUCHBAR_H
 
 #include <QObject>
+#include <QQuickWindow>
 
 struct MainWindowTouchBarPrivate;
-class MainWindowTouchBar : public QObject
-{
-    Q_OBJECT
+class MainWindowTouchBar : public QObject {
+        Q_OBJECT
     public:
-        explicit MainWindowTouchBar(QWidget *parent = nullptr);
+        explicit MainWindowTouchBar(QQuickWindow* parent = nullptr);
         ~MainWindowTouchBar();
 
     signals:
@@ -17,7 +17,6 @@ class MainWindowTouchBar : public QObject
         MainWindowTouchBarPrivate* d;
 
         void setupTouchBar();
-
 };
 
 #endif // MAINWINDOWTOUCHBAR_H
diff --git a/plugins/MacIntegration/mainwindowtouchbar_p.h b/plugins/MacIntegration/mainwindowtouchbar_p.h
@@ -1,10 +1,10 @@
 #ifndef MAINWINDOWTOUCHBAR_P_H
 #define MAINWINDOWTOUCHBAR_P_H
 
-#include <QWidget>
+#include <QQuickWindow>
 
 struct MainWindowTouchBarPrivate {
-    QWidget* parentWidget;
+        QQuickWindow* parentWidget;
 };
 
 #endif // MAINWINDOWTOUCHBAR_P_H