Fixed some frameless bugs & more frameless & Tweaked about dialog

kaniol-lck · Jul 4, 2024 · de62997 · de62997
1 parent d822353
commit de62997
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 60 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -54,10 +54,10 @@ int main(int argc, char *argv[])
 
 #ifdef Q_OS_WIN
     if(Config().getUseFramelessWindow()){
-        auto titleBar = new WindowsTitleBar(&w, w.menuBar());
-        auto frameless = new FramelessWrapper(nullptr, &w, titleBar);
+        QApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
+        QApplication::setAttribute(Qt::AA_NativeWindows, false);
+        auto frameless = new FramelessWrapper(&w);
         QObject::connect(&w, &ModManager::closed, frameless, &FramelessWrapper::close);
-        titleBar->setParentWidget(frameless);
         frameless->show();
     } else
 #endif

diff --git a/src/ui/aboutdialog.cpp b/src/ui/aboutdialog.cpp
@@ -18,6 +18,14 @@ AboutDialog::AboutDialog(QWidget *parent) :
 {
     ui->setupUi(this);
     ui->versionText->setText(kVersion);
+    ui->credit_label->setText(QString("Built with Qt %1\n"
+                                      "3rd-Party Libraries:\n"
+                                      "libaria2   https://aria2.github.io/\n"
+                                      "Quazip     https://github.com/stachenov/quazip\n"
+                                      "cpp-semver https://github.com/easz/cpp-semver\n"
+                                      "toml++     https://github.com/marzer/tomlplusplus")
+                                  .arg(QT_VERSION_STR));
+
     setAttribute(Qt::WA_DeleteOnClose);
 #ifdef DE_KDE
     //TODO: window not blur in next show

diff --git a/src/ui/aboutdialog.ui b/src/ui/aboutdialog.ui
@@ -72,7 +72,6 @@
        <widget class="QLabel" name="versionText">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -200,14 +199,7 @@
             </widget>
            </item>
            <item row="2" column="1">
-            <widget class="QLabel" name="label_9">
-             <property name="text">
-              <string notr="true">Qt v5.15.2
-libaria2 v1.36.0
-Quazip 0.7.3
-toml++ v2.5.0</string>
-             </property>
-            </widget>
+            <widget class="QLabel" name="credit_label"/>
            </item>
           </layout>
          </item>

diff --git a/src/ui/curseforge/curseforgemodbrowser.cpp b/src/ui/curseforge/curseforgemodbrowser.cpp
@@ -354,9 +354,9 @@ CurseforgeMod *CurseforgeModBrowser::selectedMod() const
     return selectedMod_;
 }
 
-ExploreBrowser *CurseforgeModBrowser::another()
+ExploreBrowser *CurseforgeModBrowser::another(QWidget *parent)
 {
-    return new CurseforgeModBrowser;
+    return new CurseforgeModBrowser(parent);
 }
 
 void CurseforgeModBrowser::on_sortSelect_currentIndexChanged(int)

diff --git a/src/ui/curseforge/curseforgemodbrowser.h b/src/ui/curseforge/curseforgemodbrowser.h
@@ -33,7 +33,7 @@ class CurseforgeModBrowser : public ExploreBrowser
     QWidget *fileListWidget() const override;
     CurseforgeMod *selectedMod() const;
 
-    ExploreBrowser *another() override;
+    ExploreBrowser *another(QWidget *parent = nullptr) override;
 
     CurseforgeManager *manager() const;
 

diff --git a/src/ui/explorebrowser.cpp b/src/ui/explorebrowser.cpp
@@ -17,6 +17,7 @@
 #include "exploremanager.h"
 #include "local/localmodpath.h"
 #include "local/localmodpathmanager.h"
+#include "ui/framelesswrapper.h"
 #include "util/smoothscrollbar.h"
 
 ExploreBrowser::ExploreBrowser(QWidget *parent, const QIcon &icon, const QString &name, const QUrl &url) :
@@ -68,7 +69,14 @@ ExploreBrowser::ExploreBrowser(QWidget *parent, const QIcon &icon, const QString
         QDesktopServices::openUrl(url);
     });
     openDialogAction_ = menu_->addAction(QIcon::fromTheme("window-new"), tr("Open in New Dialog"), this, [=]{
-        another()->show();
+        auto b = another();
+#ifdef Q_OS_WIN
+        if(Config().getUseFramelessWindow()){
+            auto frameless = new FramelessWrapper(b);
+            frameless->show();
+        } else
+#endif
+            b->show();
     });
     menu_->addMenu(downloadPathSelectMenu_);
 }

diff --git a/src/ui/explorebrowser.h b/src/ui/explorebrowser.h
@@ -24,7 +24,7 @@ class ExploreBrowser : public Browser
     explicit ExploreBrowser(QWidget *parent, const QIcon &icon, const QString &name, const QUrl &url);
     virtual ~ExploreBrowser() = default;
 
-    virtual ExploreBrowser *another() = 0;
+    virtual ExploreBrowser *another(QWidget *parent = nullptr) = 0;
 
     QAction *visitWebsiteAction() const;
     QIcon icon() const override;

diff --git a/src/ui/framelesswrapper.cpp b/src/ui/framelesswrapper.cpp
@@ -17,17 +17,21 @@
 #include "windowstitlebar.h"
 #include "config.hpp"
 
-FramelessWrapper::FramelessWrapper(QWidget *parent, QWidget *widget, QMenuBar *menuBar) :
-    FramelessWrapper(parent, widget, new WindowsTitleBar(widget, menuBar))
+FramelessWrapper::FramelessWrapper(QMainWindow *window) :
+    FramelessWrapper(window, window->menuBar())
+{}
+
+FramelessWrapper::FramelessWrapper(QDialog *dialog) :
+    FramelessWrapper((QWidget*)dialog)
 {
-    titleBar_->setParentWidget(this);
+    connect(dialog, &QDialog::finished, this, &FramelessWrapper::close);
 }
 
-FramelessWrapper::FramelessWrapper(QWidget *parent, QWidget *widget, WindowsTitleBar *titleBar) :
-    QMainWindow(parent),
-    titleBar_(titleBar)
+FramelessWrapper::FramelessWrapper(QWidget *widget, QMenuBar *menuBar) :
+    QMainWindow(widget->parentWidget()),
+    titleBar_(new WindowsTitleBar(widget, menuBar))
 {
-//    setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMaximizeButtonHint);
+    titleBar_->setParentWidget(this);
 
     auto w = new QWidget(this);
     auto layout = new QVBoxLayout;
@@ -39,12 +43,6 @@ FramelessWrapper::FramelessWrapper(QWidget *parent, QWidget *widget, WindowsTitl
     setCentralWidget(w);
 
     updateBlur();
-
-#ifdef Q_OS_WIN
-//    HWND hwnd = (HWND)winId();
-//    DWORD style = ::GetWindowLong(hwnd, GWL_STYLE);
-//    ::SetWindowLong(hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CAPTION);
-#endif //Q_OS_WIN
 }
 
 void FramelessWrapper::updateBlur()
@@ -56,11 +54,7 @@ void FramelessWrapper::updateBlur()
         if(setWindowCompositionAttribute){
             ACCENT_STATE as;
             if(Config().getEnableBlurBehind()){
-//                qDebug() << isMoving_;
-//                if(isMoving_)
                     as = ACCENT_ENABLE_BLURBEHIND;
-//                else
-//                    as = ACCENT_ENABLE_ACRYLICBLURBEHIND;
             }
             else
                 as = ACCENT_ENABLE_GRADIENT;

diff --git a/src/ui/framelesswrapper.h b/src/ui/framelesswrapper.h
@@ -1,19 +1,18 @@
 #ifndef FRAMELESSWRAPPER_H
 #define FRAMELESSWRAPPER_H
 
-#include <QMenuBar>
 #include <QMainWindow>
 
-class QMainWindow;
 class WindowsTitleBar;
 
 class FramelessWrapper : public QMainWindow
 {
     Q_OBJECT
 
 public:
-    FramelessWrapper(QWidget *parent, QWidget *widget, QMenuBar *menuBar = nullptr);
-    FramelessWrapper(QWidget *parent, QWidget *widget, WindowsTitleBar *titleBar);
+    FramelessWrapper(QMainWindow *window);
+    FramelessWrapper(QDialog *dialog);
+    FramelessWrapper(QWidget *widget, QMenuBar *menuBar = nullptr);
 
 private slots:
     void updateBlur();
@@ -25,7 +24,6 @@ private slots:
 
 private:
     WindowsTitleBar *titleBar_;
-    bool isMoving_ = false;
 };
 
 #endif // FRAMELESSWRAPPER_H
diff --git a/src/ui/github/githubrepobrowser.cpp b/src/ui/github/githubrepobrowser.cpp
@@ -76,9 +76,9 @@ void GitHubRepoBrowser::updateUi()
 
 }
 
-ExploreBrowser *GitHubRepoBrowser::another()
+ExploreBrowser *GitHubRepoBrowser::another(QWidget *parent)
 {
-    return new GitHubRepoBrowser(nullptr, info_);
+    return new GitHubRepoBrowser(parent, info_);
 }
 
 void GitHubRepoBrowser::loadMore()

diff --git a/src/ui/github/githubrepobrowser.h b/src/ui/github/githubrepobrowser.h
@@ -38,7 +38,7 @@ public slots:
     void searchModByPathInfo(LocalModPath *path) override;
     void updateUi() override;
 
-    ExploreBrowser *another() override;
+    ExploreBrowser *another(QWidget *parent = nullptr) override;
 
 signals:
     void downloadPathChanged(LocalModPath *path);

diff --git a/src/ui/modmanager.cpp b/src/ui/modmanager.cpp
@@ -126,11 +126,6 @@ ModManager::~ModManager()
     delete ui;
 }
 
-QMenuBar *ModManager::menuBar() const
-{
-    return ui->menubar;
-}
-
 void ModManager::updateUi()
 {
     pageSwitcher_.updateUi();
@@ -255,7 +250,14 @@ void ModManager::on_actionPreferences_triggered()
     connect(preferences, &Preferences::accepted, this, &ModManager::updateUi, Qt::UniqueConnection);
     connect(preferences, &Preferences::accepted, this, &ModManager::setProxy, Qt::UniqueConnection);
     connect(preferences, &Preferences::accepted, QAria2::qaria2(), &QAria2::updateOptions, Qt::UniqueConnection);
-    preferences->exec();
+
+#ifdef Q_OS_WIN
+    if(config_.getUseFramelessWindow()){
+        auto frameless = new FramelessWrapper(preferences);
+        frameless->show();
+    } else
+#endif
+        preferences->exec();
 }
 
 void ModManager::on_actionManage_Browser_triggered()
@@ -319,7 +321,7 @@ void ModManager::on_action_About_Mod_Manager_triggered()
     auto dialog = new AboutDialog(this);
 #ifdef Q_OS_WIN
     if(config_.getUseFramelessWindow()){
-        auto frameless = new FramelessWrapper(this, dialog);
+        auto frameless = new FramelessWrapper(dialog);
         frameless->show();
     } else
 #endif

diff --git a/src/ui/modmanager.h b/src/ui/modmanager.h
@@ -30,8 +30,6 @@ class ModManager : public QMainWindow
     ModManager(QWidget *parent = nullptr);
     ~ModManager();
 
-    QMenuBar *menuBar() const;
-
 signals:
     void menuBarChanged();
     void closed();

diff --git a/src/ui/modrinth/modrinthmodbrowser.cpp b/src/ui/modrinth/modrinthmodbrowser.cpp
@@ -452,9 +452,9 @@ ModrinthMod *ModrinthModBrowser::selectedMod() const
     return selectedMod_;
 }
 
-ExploreBrowser *ModrinthModBrowser::another()
+ExploreBrowser *ModrinthModBrowser::another(QWidget *parent)
 {
-    return new ModrinthModBrowser;
+    return new ModrinthModBrowser(parent);
 }
 
 void ModrinthModBrowser::on_menuDownload_aboutToShow()

diff --git a/src/ui/modrinth/modrinthmodbrowser.h b/src/ui/modrinth/modrinthmodbrowser.h
@@ -33,7 +33,7 @@ class ModrinthModBrowser : public ExploreBrowser
     QWidget *fileListWidget() const override;
     ModrinthMod *selectedMod() const;
 
-    ExploreBrowser *another() override;
+    ExploreBrowser *another(QWidget *parent = nullptr) override;
 
     ModrinthManager *manager() const;
 

diff --git a/src/ui/optifine/optifinemodbrowser.cpp b/src/ui/optifine/optifinemodbrowser.cpp
@@ -95,9 +95,9 @@ void OptifineModBrowser::updateUi()
 //        widget->updateUi();
 }
 
-ExploreBrowser *OptifineModBrowser::another()
+ExploreBrowser *OptifineModBrowser::another(QWidget *parent)
 {
-    return new OptifineModBrowser;
+    return new OptifineModBrowser(parent);
 }
 
 QWidget *OptifineModBrowser::getListViewIndexWidget(const QModelIndex &index)

diff --git a/src/ui/optifine/optifinemodbrowser.h b/src/ui/optifine/optifinemodbrowser.h
@@ -33,7 +33,7 @@ public slots:
     void searchModByPathInfo(LocalModPath *path) override;
     void updateUi() override;
 
-    ExploreBrowser *another() override;
+    ExploreBrowser *another(QWidget *parent = nullptr) override;
 
 private slots:
     void on_actionGet_OptiFabric_triggered();

diff --git a/src/ui/replay/replaymodbrowser.cpp b/src/ui/replay/replaymodbrowser.cpp
@@ -97,9 +97,9 @@ void ReplayModBrowser::updateUi()
 
 }
 
-ExploreBrowser *ReplayModBrowser::another()
+ExploreBrowser *ReplayModBrowser::another(QWidget *parent)
 {
-    return new ReplayModBrowser;
+    return new ReplayModBrowser(parent);
 }
 
 QWidget *ReplayModBrowser::getListViewIndexWidget(const QModelIndex &index)

diff --git a/src/ui/replay/replaymodbrowser.h b/src/ui/replay/replaymodbrowser.h
@@ -32,7 +32,7 @@ public slots:
     void searchModByPathInfo(LocalModPath *path) override;
     void updateUi() override;
 
-    ExploreBrowser *another() override;
+    ExploreBrowser *another(QWidget *parent = nullptr) override;
 
 private slots:
     void on_versionSelect_currentIndexChanged(int index);