Fix bugs on macOS

CrSjimo · CrSjimo · commit d79adbbf5b5b · 2025-12-14T00:32:16.000+08:00
diff --git a/src/libs/3rdparty/opendspx b/src/libs/3rdparty/opendspx
@@ -1 +1 @@
-Subproject commit 6fda26bb78001cf955bfd190a3bddff9c6498bde
+Subproject commit 0a4bb52e0f199d74d288eda2c9c41bfe2d34d80d
diff --git a/src/libs/application/dspxmodel/tests/dspx/main.cpp b/src/libs/application/dspxmodel/tests/dspx/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char **argv) {
     // Test TrackList functionality
     qDebug() << "=== Testing TrackList ===";
     
-    auto trackList = model.trackList();
+    auto trackList = model.tracks();
     qDebug() << "Initial track count:" << trackList->size();
     
     // Create some tracks
diff --git a/src/libs/application/uishell/src/qml/ProjectWindow.qml b/src/libs/application/uishell/src/qml/ProjectWindow.qml
@@ -65,6 +65,9 @@ Window {
             windowAgent.setSystemButton(WindowAgent.Close, closeSystemButton)
             windowAgent.setSystemButton(WindowAgent.WindowIcon, iconArea)
             windowAgent.setHitTestVisible(Overlay.overlay)
+            windowAgent.setHitTestVisible(leftToolBarContainer)
+            windowAgent.setHitTestVisible(rightToolBarContainer)
+            windowAgent.setHitTestVisible(middleToolBarContainer)
         }
     }
 
@@ -172,7 +175,8 @@ Window {
                 Item {
                     id: titleBarArea
                     Layout.fillWidth: true
-                    Layout.fillHeight: true
+                    Layout.fillHeight: !window.isMacOS
+                    Layout.preferredHeight: window.isMacOS ? titleBar.height + toolBar.height : undefined
                     RowLayout {
                         anchors.right: parent.right
                         visible: !window.isMacOS
@@ -231,7 +235,9 @@ Window {
                 color: parent.color
             }
         }
-        PaneSeparator {}
+        PaneSeparator {
+            visible: !window.isMacOS
+        }
         Rectangle {
             id: separatedMenuParent
             Layout.fillWidth: true
diff --git a/src/plugins/audio/internal/AudioPlugin.cpp b/src/plugins/audio/internal/AudioPlugin.cpp
@@ -14,10 +14,10 @@
 
 #include <coreplugin/CoreInterface.h>
 
-#include <audio/internal/audioandmidipage.h>
-#include <audio/internal/audiooutputpage.h>
-#include <audio/internal/audiosystem.h>
-#include <audio/internal/outputsystem.h>
+#include <audio/internal/AudioAndMidiPage.h>
+#include <audio/internal/AudioOutputPage.h>
+#include <audio/internal/AudioSystem.h>
+#include <audio/internal/OutputSystem.h>
 
 namespace Audio::Internal {
 
diff --git a/src/plugins/audio/internal/AudioSystem.cpp b/src/plugins/audio/internal/AudioSystem.cpp
@@ -1,6 +1,6 @@
 #include "AudioSystem.h"
 
-#include <audio/internal/outputsystem.h>
+#include <audio/internal/OutputSystem.h>
 
 namespace Audio::Internal {
 
diff --git a/src/plugins/audio/internal/dialogs/AudioTroubleshootingDialog.cpp b/src/plugins/audio/internal/dialogs/AudioTroubleshootingDialog.cpp
@@ -11,9 +11,9 @@
 #include <QPlainTextEdit>
 #include <QVBoxLayout>
 
-#include <audio/internal/audiooutputsettingshelper.h>
-#include <audio/internal/audiosystem.h>
-#include <audio/internal/outputsystem.h>
+#include <audio/internal/AudioOutputSettingsHelper.h>
+#include <audio/internal/AudioSystem.h>
+#include <audio/internal/OutputSystem.h>
 
 namespace Audio::Internal {
 
diff --git a/src/plugins/audio/internal/settings/AudioOutputPage.cpp b/src/plugins/audio/internal/settings/AudioOutputPage.cpp
@@ -6,7 +6,7 @@
 
 #include <CoreApi/runtimeinterface.h>
 
-#include <audio/internal/audiooutputsettingshelper.h>
+#include <audio/internal/AudioOutputSettingsHelper.h>
 
 namespace Audio::Internal {
 
diff --git a/src/plugins/audio/internal/utils/AudioOutputSettingsHelper.cpp b/src/plugins/audio/internal/utils/AudioOutputSettingsHelper.cpp
@@ -10,8 +10,8 @@
 #include <TalcsDevice/AudioDriver.h>
 #include <TalcsDevice/AudioDriverManager.h>
 
-#include <audio/internal/audiosystem.h>
-#include <audio/internal/outputsystem.h>
+#include <audio/internal/AudioSystem.h>
+#include <audio/internal/OutputSystem.h>
 
 namespace Audio::Internal {
 
diff --git a/src/plugins/coreplugin/qml/actions/GlobalActions.qml b/src/plugins/coreplugin/qml/actions/GlobalActions.qml
@@ -11,12 +11,15 @@ import DiffScope.UIShell
 import DiffScope.Core
 
 ActionCollection {
+    id: d
+    
+    required property ActionWindowInterfaceBase windowHandle
 
     ActionItem {
         actionId: "org.diffscope.core.file.new"
         Action {
             onTriggered: (o) => {
-                CoreInterface.newFile(o?.Window.window ?? null)
+                CoreInterface.newFile(d.windowHandle.window)
             }
         }
     }
@@ -25,7 +28,7 @@ ActionCollection {
         actionId: "org.diffscope.core.file.newFromTemplate"
         Action {
             onTriggered: (o) => {
-                CoreInterface.newFileFromTemplate("", o?.Window.window ?? null)
+                CoreInterface.newFileFromTemplate("", d.windowHandle.window)
             }
         }
     }
@@ -34,7 +37,7 @@ ActionCollection {
         actionId: "org.diffscope.core.file.open"
         Action {
             onTriggered: (o) => {
-                CoreInterface.openFile("", o?.Window.window ?? null)
+                CoreInterface.openFile("", d.windowHandle.window)
             }
         }
     }
@@ -52,7 +55,7 @@ ActionCollection {
         actionId: "org.diffscope.core.settings"
         Action {
             onTriggered: (o) => {
-                let w = o.Window.window
+                let w = d.windowHandle.window
                 Qt.callLater(() => CoreInterface.execSettingsDialog("", w))
             }
         }
@@ -62,7 +65,7 @@ ActionCollection {
         actionId: "org.diffscope.core.plugins"
         Action {
             onTriggered: (o) => {
-                let w = o.Window.window
+                let w = d.windowHandle.window
                 Qt.callLater(() => CoreInterface.execPluginsDialog(w))
             }
         }
@@ -90,7 +93,7 @@ ActionCollection {
         actionId: "org.diffscope.core.aboutApp"
         Action {
             onTriggered: (o) => {
-                let w = o.Window.window
+                let w = d.windowHandle.window
                 Qt.callLater(() => CoreInterface.execAboutAppDialog(w))
             }
         }
@@ -100,7 +103,7 @@ ActionCollection {
         actionId: "org.diffscope.core.aboutQt"
         Action {
             onTriggered: (o) => {
-                let w = o.Window.window
+                let w = d.windowHandle.window
                 Qt.callLater(() => CoreInterface.execAboutQtDialog(w))
             }
         }
diff --git a/src/plugins/coreplugin/windows/ActionWindowInterfaceBase.cpp b/src/plugins/coreplugin/windows/ActionWindowInterfaceBase.cpp
@@ -47,7 +47,9 @@ namespace Core {
                 if (component.isError()) {
                     qFatal() << component.errorString();
                 }
-                auto o = component.create();
+                auto o = component.createWithInitialProperties({
+                    {"windowHandle", QVariant::fromValue(q)}
+                });
                 o->setParent(q);
                 QMetaObject::invokeMethod(o, "registerToContext", actionContext);
             }
diff --git a/src/plugins/maintenance/internal/ApplicationUpdateChecker.cpp b/src/plugins/maintenance/internal/ApplicationUpdateChecker.cpp
@@ -9,7 +9,7 @@
 
 #include <CoreApi/runtimeinterface.h>
 
-#include <maintenance/internal/maintenanceplugin.h>
+#include <maintenance/internal/MaintenancePlugin.h>
 
 namespace Maintenance {
 
diff --git a/src/plugins/maintenance/internal/ApplicationUpdateChecker_p.h b/src/plugins/maintenance/internal/ApplicationUpdateChecker_p.h
@@ -3,7 +3,7 @@
 
 #include <QNetworkAccessManager>
 
-#include <maintenance/internal/applicationupdatechecker.h>
+#include <maintenance/internal/ApplicationUpdateChecker.h>
 
 namespace Maintenance {
 
diff --git a/src/plugins/maintenance/internal/MaintenancePlugin.cpp b/src/plugins/maintenance/internal/MaintenancePlugin.cpp
@@ -14,9 +14,9 @@
 #include <coreplugin/HomeWindowInterface.h>
 #include <coreplugin/ProjectWindowInterface.h>
 
-#include <maintenance/internal/applicationupdatechecker.h>
-#include <maintenance/internal/maintenanceaddon.h>
-#include <maintenance/internal/updatepage.h>
+#include <maintenance/internal/ApplicationUpdateChecker.h>
+#include <maintenance/internal/MaintenanceAddOn.h>
+#include <maintenance/internal/UpdatePage.h>
 
 static auto getMaintenanceActionExtension() {
     return QAK_STATIC_ACTION_EXTENSION(maintenance);
diff --git a/src/plugins/maintenance/internal/addons/MaintenanceAddOn.cpp b/src/plugins/maintenance/internal/addons/MaintenanceAddOn.cpp
@@ -18,7 +18,7 @@
 
 #include <coreplugin/ActionWindowInterfaceBase.h>
 
-#include <maintenance/internal/maintenanceplugin.h>
+#include <maintenance/internal/MaintenancePlugin.h>
 
 namespace Maintenance {
 
diff --git a/src/plugins/maintenance/internal/settings/UpdatePage.cpp b/src/plugins/maintenance/internal/settings/UpdatePage.cpp
@@ -7,7 +7,7 @@
 
 #include <CoreApi/runtimeinterface.h>
 
-#include <maintenance/internal/applicationupdatechecker.h>
+#include <maintenance/internal/ApplicationUpdateChecker.h>
 
 namespace Maintenance {
 
diff --git a/src/plugins/welcomewizard/internal/WelcomeWizardPlugin.cpp b/src/plugins/welcomewizard/internal/WelcomeWizardPlugin.cpp
@@ -13,7 +13,7 @@
 #include <coreplugin/HomeWindowInterface.h>
 #include <coreplugin/ProjectWindowInterface.h>
 
-#include <welcomewizard/internal/welcomewizardaddon.h>
+#include <welcomewizard/internal/WelcomeWizardAddOn.h>
 
 static auto getWelcomeWizardActionExtension() {
     return QAK_STATIC_ACTION_EXTENSION(welcomewizard);
diff --git a/src/plugins/welcomewizard/internal/addons/WelcomeWizardAddOn.cpp b/src/plugins/welcomewizard/internal/addons/WelcomeWizardAddOn.cpp
@@ -7,7 +7,7 @@
 
 #include <coreplugin/ActionWindowInterfaceBase.h>
 
-#include <welcomewizard/internal/welcomewizardplugin.h>
+#include <welcomewizard/internal/WelcomeWizardPlugin.h>
 
 namespace WelcomeWizard {
     WelcomeWizardAddOn::WelcomeWizardAddOn(QObject *parent) : Core::WindowInterfaceAddOn(parent) {

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,15 @@ import DiffScope.UIShell`
`11`	`11`	`import DiffScope.Core`
`12`	`12`
`13`	`13`	`ActionCollection {`
	`14`	`+ id: d`
	`15`	`+`
	`16`	`+ required property ActionWindowInterfaceBase windowHandle`
`14`	`17`
`15`	`18`	`ActionItem {`
`16`	`19`	`actionId: "org.diffscope.core.file.new"`
`17`	`20`	`Action {`
`18`	`21`	`onTriggered: (o) => {`
`19`		`- CoreInterface.newFile(o?.Window.window ?? null)`
	`22`	`+ CoreInterface.newFile(d.windowHandle.window)`
`20`	`23`	`}`
`21`	`24`	`}`
`22`	`25`	`}`
`@@ -25,7 +28,7 @@ ActionCollection {`
`25`	`28`	`actionId: "org.diffscope.core.file.newFromTemplate"`
`26`	`29`	`Action {`
`27`	`30`	`onTriggered: (o) => {`
`28`		`- CoreInterface.newFileFromTemplate("", o?.Window.window ?? null)`
	`31`	`+ CoreInterface.newFileFromTemplate("", d.windowHandle.window)`
`29`	`32`	`}`
`30`	`33`	`}`
`31`	`34`	`}`
`@@ -34,7 +37,7 @@ ActionCollection {`
`34`	`37`	`actionId: "org.diffscope.core.file.open"`
`35`	`38`	`Action {`
`36`	`39`	`onTriggered: (o) => {`
`37`		`- CoreInterface.openFile("", o?.Window.window ?? null)`
	`40`	`+ CoreInterface.openFile("", d.windowHandle.window)`
`38`	`41`	`}`
`39`	`42`	`}`
`40`	`43`	`}`
`@@ -52,7 +55,7 @@ ActionCollection {`
`52`	`55`	`actionId: "org.diffscope.core.settings"`
`53`	`56`	`Action {`
`54`	`57`	`onTriggered: (o) => {`
`55`		`- let w = o.Window.window`
	`58`	`+ let w = d.windowHandle.window`
`56`	`59`	`Qt.callLater(() => CoreInterface.execSettingsDialog("", w))`
`57`	`60`	`}`
`58`	`61`	`}`
`@@ -62,7 +65,7 @@ ActionCollection {`
`62`	`65`	`actionId: "org.diffscope.core.plugins"`
`63`	`66`	`Action {`
`64`	`67`	`onTriggered: (o) => {`
`65`		`- let w = o.Window.window`
	`68`	`+ let w = d.windowHandle.window`
`66`	`69`	`Qt.callLater(() => CoreInterface.execPluginsDialog(w))`
`67`	`70`	`}`
`68`	`71`	`}`
`@@ -90,7 +93,7 @@ ActionCollection {`
`90`	`93`	`actionId: "org.diffscope.core.aboutApp"`
`91`	`94`	`Action {`
`92`	`95`	`onTriggered: (o) => {`
`93`		`- let w = o.Window.window`
	`96`	`+ let w = d.windowHandle.window`
`94`	`97`	`Qt.callLater(() => CoreInterface.execAboutAppDialog(w))`
`95`	`98`	`}`
`96`	`99`	`}`
`@@ -100,7 +103,7 @@ ActionCollection {`
`100`	`103`	`actionId: "org.diffscope.core.aboutQt"`
`101`	`104`	`Action {`
`102`	`105`	`onTriggered: (o) => {`
`103`		`- let w = o.Window.window`
	`106`	`+ let w = d.windowHandle.window`
`104`	`107`	`Qt.callLater(() => CoreInterface.execAboutQtDialog(w))`
`105`	`108`	`}`
`106`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,9 @@ namespace Core {`
`47`	`47`	`if (component.isError()) {`
`48`	`48`	`qFatal() << component.errorString();`
`49`	`49`	`}`
`50`		`- auto o = component.create();`
	`50`	`+ auto o = component.createWithInitialProperties({`
	`51`	`+ {"windowHandle", QVariant::fromValue(q)}`
	`52`	`+ });`
`51`	`53`	`o->setParent(q);`
`52`	`54`	`QMetaObject::invokeMethod(o, "registerToContext", actionContext);`
`53`	`55`	`}`