Theme icon fixes

friction2d · Aug 11, 2024 · b05b90a · b05b90a
1 parent fd88cec
commit b05b90a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
@@ -1473,11 +1473,11 @@ void MainWindow::setupToolBar()
     mToolbar->setFocusPolicy(Qt::NoFocus);
     mToolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     mToolbar->setMovable(false);
-    /*eSizesUI::widget.add(mToolbar, [this](const int size) {
-        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+    eSizesUI::widget.add(mToolbar, [this](const int size) {
+        //if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
             mToolbar->setIconSize(QSize(size, size));
-        }
-    });*/
+        //}
+    });
     addToolBar(mToolbar);
 
 

diff --git a/src/ui/widgets/aboutwidget.cpp b/src/ui/widgets/aboutwidget.cpp
@@ -23,6 +23,7 @@
 
 #include "aboutwidget.h"
 #include "appsupport.h"
+#include "themesupport.h"
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -42,12 +43,13 @@ AboutWidget::AboutWidget(QWidget *parent)
     const auto mTopLabel = new QLabel(this);
 
     QString label = QString::fromUtf8("<div style=\"margin: 0; padding: 0; text-align: center; font-weight: normal;\">"
-                                      "<img src=\":/icons/hicolor/%2x%2/apps/%4.png\" width=\"%2\" height=\"%2\">"
+                                      "<img src=\":/icons/hicolor/%5x%5/apps/%4.png\" width=\"%2\" height=\"%2\">"
                                       "<h1 style=\"font-weight: normal; margin-top: 0; padding-top: 0;\">%3<br><span style=\"font-size: large;\">%1</span></h1>"
                                       "</div>").arg(AppSupport::getAppVersion(),
-                                                    QString::number(96),
+                                                    QString::number(ThemeSupport::getIconSize(96).width()),
                                                     AppSupport::getAppDisplayName(),
-                                                    AppSupport::getAppID());
+                                                    AppSupport::getAppID(),
+                                                    QString::number(ThemeSupport::getIconSize(96 * 2).width()));
     const auto buildInfo = AppSupport::getAppBuildInfo(true);
     if (!buildInfo.isEmpty()) {
         label.append(buildInfo);

diff --git a/src/ui/widgets/fakemenubar.cpp b/src/ui/widgets/fakemenubar.cpp
@@ -91,7 +91,7 @@ FakeMenuBar::FakeMenuBar(QWidget* const parent) :
     mActsLayout = new QHBoxLayout();
     mActsLayout->setAlignment(Qt::AlignLeft);
     mActsLayout->setContentsMargins(0, 0, 0, 0);
-    mActsLayout->setSpacing(0);
+    mActsLayout->setSpacing(1);
 
     mainLayout->addLayout(mActsLayout);
 

diff --git a/src/ui/widgets/welcomedialog.cpp b/src/ui/widgets/welcomedialog.cpp
@@ -31,6 +31,8 @@
 #include <QLabel>
 
 #include "appsupport.h"
+#include "themesupport.h"
+#include "Private/esettings.h"
 
 WelcomeDialog::WelcomeDialog(QMenu *recentMenu,
                              const std::function<void()> &newFunc,
@@ -54,13 +56,14 @@ WelcomeDialog::WelcomeDialog(QMenu *recentMenu,
     logoLabel->setMinimumWidth(logoSize*2);
     logoLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
     logoLabel->setText(QString::fromUtf8("<div style=\"margin: 0; padding: 0; text-align: center; font-weight: normal;\">"
-                                         "<p style=\"margin: 0; padding: 0;\"><img src=\":/icons/hicolor/%2x%2/apps/%4.png\" width=\"%2\" height=\"%2\"></p>"
+                                         "<p style=\"margin: 0; padding: 0;\"><img src=\":/icons/hicolor/%5x%5/apps/%4.png\" width=\"%2\" height=\"%2\"></p>"
                                          "<h1 style=\"font-weight: normal; margin-top: 0; padding-top: 0;\">%3<br><span style=\"font-size: large;\">%1</span></h1>"
                                          "</div>")
                                         .arg(AppSupport::getAppVersion(),
-                                             QString::number(logoSize),
+                                             QString::number(ThemeSupport::getIconSize(logoSize).width()),
                                              AppSupport::getAppDisplayName(),
-                                             AppSupport::getAppID()));
+                                             AppSupport::getAppID(),
+                                             QString::number(ThemeSupport::getIconSize(logoSize * 2).width())));
 
     const auto buttonWid = new QWidget(this);
     buttonWid->setContentsMargins(0, 0, 0, 0);