Fix window file behavior on macOS

Author: CrSjimo

src/libs/3rdparty/choruskit

@@ -208,6 +208,8 @@ Window {
                     source: window.icon
                     Layout.preferredWidth: 16
                     Layout.preferredHeight: 16
+                    sourceSize.width: 16
+                    sourceSize.height: 16
                 }
                 Text {
                     readonly property color _baseColor: !titleTextGroup.menuBarMergedInTitleBar ? Theme.foregroundPrimaryColor : Theme.foregroundSecondaryColor

src/libs/application/uishell/src/qml/ProjectWindow.qml

@@ -21,7 +21,7 @@ ProjectWindow {
     frameless: BehaviorPreference.uiBehavior & BehaviorPreference.UB_Frameless
     useSeparatedMenu: !(BehaviorPreference.uiBehavior & BehaviorPreference.UB_MergeMenuAndTitleBar)
     documentName: [
-        ((BehaviorPreference.uiBehavior & BehaviorPreference.UB_FullPath) ? windowHandle.projectDocumentContext.fileLocker?.path : windowHandle.projectDocumentContext.fileLocker?.entryName) || qsTr("Untitled"),
+        ((BehaviorPreference.uiBehavior & BehaviorPreference.UB_FullPath) ? windowHandle.projectDocumentContext.fileLocker?.path : windowHandle.projectDocumentContext.fileLocker?.entryName) || qsTr("Untitled") + ".dspx",
         windowHandle.projectDocumentContext.fileLocker.fileModifiedSinceLastSave ? "Modified Externally" : ""
     ].filter(x => x).join(" - ")
 

src/plugins/coreplugin/qml/windows/ProjectWindow.qml

@@ -204,12 +204,36 @@ namespace Core {
         SVS::StatusTextContext::setStatusContext(win, new SVS::StatusTextContext(win));
         SVS::StatusTextContext::setContextHelpContext(win, new SVS::StatusTextContext(win));
         d->projectDocumentContext->openSaveProjectFileScenario()->setWindow(win);
+        static QIcon dspxIcon = [] {
+            QIcon icon;
+            for (const auto &file : QDir(":/diffscope/icons/dspx").entryInfoList(QDir::Files)) {
+                icon.addFile(file.absoluteFilePath());
+            }
+            return icon;
+        }();
+        win->setIcon(QIcon(":/diffscope/icons/dspx/24x24.png"));
+        QString path;
+        if (d->projectDocumentContext->fileLocker() && !d->projectDocumentContext->fileLocker()->path().isEmpty()) {
+            path = d->projectDocumentContext->fileLocker()->path();
+        } else {
+            path = tr("Untitled") + ".dspx";
+        }
+        win->setFilePath(path);
         return win;
     }
     ProjectWindowInterface::ProjectWindowInterface(ProjectDocumentContext *projectDocumentContext, QObject *parent) : ProjectWindowInterface(*new ProjectWindowInterfacePrivate, parent) {
         Q_D(ProjectWindowInterface);
         m_instance = this;
         d->projectDocumentContext = projectDocumentContext;
+        if (d->projectDocumentContext->fileLocker()) {
+            connect(d->projectDocumentContext->fileLocker(), &FileLocker::pathChanged, this, [=, this] {
+                auto win = window();
+                if (!win)
+                    return;
+                auto path = d->projectDocumentContext->fileLocker()->path();
+                win->setFilePath(path.isEmpty() ? tr("Untitled") + ".dspx" : path);
+            });
+        }
     }
     ProjectWindowInterface::ProjectWindowInterface(ProjectWindowInterfacePrivate &d, QObject *parent) : ActionWindowInterfaceBase(parent), d_ptr(&d) {
         d.q_ptr = this;