Try to fix icon sizes (again)

Only apply icon size if dpi not 1. Icons looks good with no scaling again, and should in theory work in hidpi (not tested).
friction2d · Apr 9, 2024 · 8f3eebd · 8f3eebd
1 parent eea2623
commit 8f3eebd
Show file tree

Hide file tree

Showing 18 changed files with 94 additions and 47 deletions.
diff --git a/src/app/GUI/ColorWidgets/colorsettingswidget.cpp b/src/app/GUI/ColorWidgets/colorsettingswidget.cpp
@@ -369,7 +369,9 @@ ColorSettingsWidget::ColorSettingsWidget(QWidget *parent)
             this, &ColorSettingsWidget::startColorPicking);
     eSizesUI::widget.add(mPickingButton, [this](const int size) {
         mPickingButton->setFixedHeight(size);
-        mPickingButton->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mPickingButton->setIconSize(QSize(size, size));
+        }
     });
 
     mColorLabelLayout->addWidget(mColorLabel);

diff --git a/src/app/GUI/Expressions/expressiondialog.cpp b/src/app/GUI/Expressions/expressiondialog.cpp
@@ -593,8 +593,10 @@ ExpressionDialog::ExpressionDialog(QrealAnimator* const target,
     updateAllScript();
 
     const int pixSize = eSizesUI::widget/2;
-    mBindingsButton->setIconSize({pixSize, pixSize});
-    mDefinitionsButon->setIconSize({pixSize, pixSize});
+    if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+        mBindingsButton->setIconSize({pixSize, pixSize});
+        mDefinitionsButon->setIconSize({pixSize, pixSize});
+    }
 
     QPixmap pix(pixSize, pixSize);
     pix.fill(Qt::transparent);

diff --git a/src/app/GUI/RenderWidgets/closablecontainer.cpp b/src/app/GUI/RenderWidgets/closablecontainer.cpp
@@ -36,7 +36,9 @@ ClosableContainer::ClosableContainer(QWidget *parent) : QWidget(parent) {
     mContentArrow->setObjectName("FlatButton");
     mContentArrow->setCheckable(true);
     mContentArrow->setFixedSize(eSizesUI::widget, eSizesUI::widget);
-    mContentArrow->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
+    if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+        mContentArrow->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
+    }
     connect(mContentArrow, &QPushButton::toggled,
             this, &ClosableContainer::setContentVisible);
 

diff --git a/src/app/GUI/RenderWidgets/renderinstancewidget.cpp b/src/app/GUI/RenderWidgets/renderinstancewidget.cpp
@@ -178,13 +178,15 @@ void RenderInstanceWidget::iniGUI() {
     eSizesUI::widget.add(mOutputSettingsProfilesButton, [this](const int size) {
         mRenderSettingsButton->setFixedHeight(size);
         mOutputSettingsButton->setFixedHeight(size);
-        mOutputSettingsProfilesButton->setIconSize(QSize(size, size));
         mOutputSettingsProfilesButton->setFixedSize(QSize(size, size));
-        mOutputDestinationButton->setIconSize(QSize(size, size));
         mOutputDestinationButton->setFixedSize(QSize(size, size));
-        mPlayButton->setIconSize(QSize(size, size));
         mPlayButton->setFixedSize(QSize(size, size));
         mOutputDestinationLineEdit->setFixedHeight(size);
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mOutputSettingsProfilesButton->setIconSize(QSize(size, size));
+            mOutputDestinationButton->setIconSize(QSize(size, size));
+            mPlayButton->setIconSize(QSize(size, size));
+        }
     });
 
     QWidget *outputDestinationWidget = new QWidget(this);

diff --git a/src/app/GUI/RenderWidgets/renderwidget.cpp b/src/app/GUI/RenderWidgets/renderwidget.cpp
@@ -115,14 +115,16 @@ RenderWidget::RenderWidget(QWidget *parent)
             this, &RenderWidget::clearRenderQueue);
 
     eSizesUI::widget.add(mStartRenderButton, [this](const int size) {
-        mStartRenderButton->setIconSize(QSize(size, size));
         mStartRenderButton->setFixedHeight(size);
-        mStopRenderButton->setIconSize(QSize(size, size));
         mStopRenderButton->setFixedSize(QSize(size, size));
-        mAddRenderButton->setIconSize(QSize(size, size));
         mAddRenderButton->setFixedSize(QSize(size, size));
-        mClearQueueButton->setIconSize(QSize(size, size));
         mClearQueueButton->setFixedSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mStartRenderButton->setIconSize(QSize(size, size));
+            mStopRenderButton->setIconSize(QSize(size, size));
+            mAddRenderButton->setIconSize(QSize(size, size));
+            mClearQueueButton->setIconSize(QSize(size, size));
+        }
     });
 
     mContWidget = new QWidget(this);

diff --git a/src/app/GUI/Settings/pluginssettingswidget.cpp b/src/app/GUI/Settings/pluginssettingswidget.cpp
@@ -35,6 +35,7 @@
 #include <QHeaderView>
 
 #include "GUI/global.h"
+#include "Private/esettings.h"
 
 PluginsSettingsWidget::PluginsSettingsWidget(QWidget *parent)
     : SettingsWidget(parent)
@@ -60,7 +61,9 @@ PluginsSettingsWidget::PluginsSettingsWidget(QWidget *parent)
                                                    this);
     mShaderPathButton->setObjectName("FlatButton");
     mShaderPathButton->setFocusPolicy(Qt::NoFocus);
-    mShaderPathButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
+    if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+        mShaderPathButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
+    }
     mShaderPathButton->setFixedSize(QSize(eSizesUI::widget, eSizesUI::widget));
 
     mShaderLayout->addWidget(mShaderLabel);

diff --git a/src/app/GUI/Settings/settingsdialog.cpp b/src/app/GUI/Settings/settingsdialog.cpp
@@ -73,13 +73,16 @@ SettingsDialog::SettingsDialog(QWidget * const parent)
     buttonsLayout->addWidget(applyButton);
     buttonsLayout->addWidget(cancelButton);
 
-    restoreButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
     restoreButton->setFixedHeight(eSizesUI::widget);
-    cancelButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
     cancelButton->setFixedHeight(eSizesUI::widget);
-    applyButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
     applyButton->setFixedHeight(eSizesUI::widget);
 
+    if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+        restoreButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
+        cancelButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
+        applyButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
+    }
+
     mainLayout->addLayout(buttonsLayout);
     const auto statusBar = new QStatusBar(this);
     statusBar->setSizeGripEnabled(false);

diff --git a/src/app/GUI/fillstrokesettings.cpp b/src/app/GUI/fillstrokesettings.cpp
@@ -266,17 +266,19 @@ FillStrokeSettingsWidget::FillStrokeSettingsWidget(Document &document,
     // adjust sizes
     eSizesUI::widget.add(mBevelJoinStyleButton, [this](const int size) {
         mBevelJoinStyleButton->setFixedHeight(size);
-        mBevelJoinStyleButton->setIconSize(QSize(size, size));
         mMiterJointStyleButton->setFixedHeight(size);
-        mMiterJointStyleButton->setIconSize(QSize(size, size));
         mRoundJoinStyleButton->setFixedHeight(size);
-        mRoundJoinStyleButton->setIconSize(QSize(size, size));
         mFlatCapStyleButton->setFixedHeight(size);
-        mFlatCapStyleButton->setIconSize(QSize(size, size));
         mSquareCapStyleButton->setFixedHeight(size);
-        mSquareCapStyleButton->setIconSize(QSize(size, size));
         mRoundCapStyleButton->setFixedHeight(size);
-        mRoundCapStyleButton->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mBevelJoinStyleButton->setIconSize(QSize(size, size));
+            mMiterJointStyleButton->setIconSize(QSize(size, size));
+            mRoundJoinStyleButton->setIconSize(QSize(size, size));
+            mFlatCapStyleButton->setIconSize(QSize(size, size));
+            mSquareCapStyleButton->setIconSize(QSize(size, size));
+            mRoundCapStyleButton->setIconSize(QSize(size, size));
+        }
     });
 
     // layout

diff --git a/src/app/GUI/fontswidget.cpp b/src/app/GUI/fontswidget.cpp
@@ -158,17 +158,19 @@ FontsWidget::FontsWidget(QWidget *parent)
 
     eSizesUI::widget.add(mAlignLeft, [this](const int size) {
         mAlignLeft->setFixedHeight(size);
-        mAlignLeft->setIconSize(QSize(size, size));
         mAlignCenter->setFixedHeight(size);
-        mAlignCenter->setIconSize(QSize(size, size));
         mAlignRight->setFixedHeight(size);
-        mAlignRight->setIconSize(QSize(size, size));
         mAlignTop->setFixedHeight(size);
-        mAlignTop->setIconSize(QSize(size, size));
         mAlignVCenter->setFixedHeight(size);
-        mAlignVCenter->setIconSize(QSize(size, size));
         mAlignBottom->setFixedHeight(size);
-        mAlignBottom->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mAlignLeft->setIconSize(QSize(size, size));
+            mAlignCenter->setIconSize(QSize(size, size));
+            mAlignRight->setIconSize(QSize(size, size));
+            mAlignTop->setIconSize(QSize(size, size));
+            mAlignVCenter->setIconSize(QSize(size, size));
+            mAlignBottom->setIconSize(QSize(size, size));
+        }
     });
 
     mTextInput = new QPlainTextEdit(this);

diff --git a/src/app/GUI/layouthandler.cpp b/src/app/GUI/layouthandler.cpp
@@ -55,7 +55,9 @@ LayoutHandler::LayoutHandler(Document& document,
     newLayPush->setObjectName("FlatButton");
     eSizesUI::widget.add(newLayPush, [newLayPush](const int size) {
         newLayPush->setFixedSize(QSize(size, size));
-        newLayPush->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            newLayPush->setIconSize(QSize(size, size));
+        }
     });
     //newLayPush->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
 
@@ -65,7 +67,9 @@ LayoutHandler::LayoutHandler(Document& document,
     removeLayPush->setObjectName("FlatButton");
     eSizesUI::widget.add(removeLayPush, [removeLayPush](const int size) {
         removeLayPush->setFixedSize(QSize(size, size));
-        removeLayPush->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            removeLayPush->setIconSize(QSize(size, size));
+        }
     });
     //removeLayPush->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
 

diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
@@ -309,7 +309,9 @@ MainWindow::MainWindow(Document& document,
     mTabColorText->setMinimumWidth(sideBarMin);
     mTabColorText->setTabPosition(QTabWidget::South);
     eSizesUI::widget.add(mTabColorText, [this](const int size) {
-        mTabColorText->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mTabColorText->setIconSize(QSize(size, size));
+        }
     });
 
     mTabColorIndex = mTabColorText->addTab(mFillStrokeSettings,
@@ -326,7 +328,9 @@ MainWindow::MainWindow(Document& document,
     mTabProperties->setMinimumWidth(sideBarMin);
     mTabProperties->setTabPosition(QTabWidget::South);
     eSizesUI::widget.add(mTabProperties, [this](const int size) {
-        mTabProperties->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mTabProperties->setIconSize(QSize(size, size));
+        }
     });
 
     const auto propertiesWidget = new QWidget(this);
@@ -1150,7 +1154,9 @@ void MainWindow::setupMenuBar()
     const auto frictionButton = new QToolButton(this);
     frictionButton->setObjectName(QString::fromUtf8("ToolButton"));
     frictionButton->setPopupMode(QToolButton::InstantPopup);
-    frictionButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
+    if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+        frictionButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
+    }
     frictionButton->setIcon(QIcon::fromTheme("friction"));
     frictionButton->setDefaultAction(aboutAct);
     frictionButton->setToolTip(QString());
@@ -1293,7 +1299,9 @@ void MainWindow::setupToolBar()
     mToolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     mToolbar->setMovable(false);
     eSizesUI::widget.add(mToolbar, [this](const int size) {
-        mToolbar->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mToolbar->setIconSize(QSize(size, size));
+        }
     });
     addToolBar(mToolbar);
 

diff --git a/src/app/GUI/timelinedockwidget.cpp b/src/app/GUI/timelinedockwidget.cpp
@@ -222,7 +222,9 @@ TimelineDockWidget::TimelineDockWidget(Document& document,
 
     mToolBar = new QToolBar(this);
     eSizesUI::widget.add(mToolBar, [this](const int size) {
-        mToolBar->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mToolBar->setIconSize(QSize(size, size));
+        }
     });
     mToolBar->setMovable(false);
 

diff --git a/src/app/GUI/toolbox.cpp b/src/app/GUI/toolbox.cpp
@@ -39,9 +39,11 @@ void MainWindow::setupToolBox()
     setupToolBoxDraw();
 
     eSizesUI::widget.add(mToolBoxMain, [this](const int size) {
-        mToolBoxMain->setIconSize(QSize(size, size));
-        mToolBoxNodes->setIconSize(QSize(size, size));
-        mToolBoxDraw->setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            mToolBoxMain->setIconSize(QSize(size, size));
+            mToolBoxNodes->setIconSize(QSize(size, size));
+            mToolBoxDraw->setIconSize(QSize(size, size));
+        }
     });
 
     mToolBoxMainIndex = mToolBoxStack->addWidget(mToolBoxMain);

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -152,6 +152,7 @@ int main(int argc, char *argv[])
         } else {
             dpi = qApp->desktop()->logicalDpiX() / 96.0; //QGuiApplication::primaryScreen()->logicalDotsPerInch() / 96.0
         }
+        settings.fCurrentInterfaceDPI = dpi;
         qDebug() << "DPI" << dpi;
         const auto fm = QFontMetrics(OS_FONT);
         const qreal scaling = qBound(0.5, dpi, 1.5);

diff --git a/src/core/Private/esettings.h b/src/core/Private/esettings.h
@@ -100,6 +100,7 @@ class CORE_EXPORT eSettings : public QObject
 
     // ui settings
     qreal fInterfaceScaling;
+    qreal fCurrentInterfaceDPI;
     bool fDefaultInterfaceScaling;
 
     // canvas settings

diff --git a/src/ui/widgets/alignwidget.cpp b/src/ui/widgets/alignwidget.cpp
@@ -30,6 +30,7 @@
 #include <QPushButton>
 
 #include "GUI/global.h"
+#include "Private/esettings.h"
 
 AlignWidget::AlignWidget(QWidget* const parent)
     : QWidget(parent)
@@ -67,12 +68,9 @@ AlignWidget::AlignWidget(QWidget* const parent)
     mainLayout->addLayout(buttonsLay);
     mainLayout->addStretch();
 
-    int buttonSize = eSizesUI::widget;
-
     const auto leftButton = new QPushButton(this);
     leftButton->setFocusPolicy(Qt::NoFocus);
     leftButton->setIcon(QIcon::fromTheme("pivot-align-left"));
-    leftButton->setIconSize(QSize(buttonSize, buttonSize));
     leftButton->setToolTip(tr("Align Left"));
     connect(leftButton, &QPushButton::pressed, this, [this]() {
         triggerAlign(Qt::AlignLeft);
@@ -82,7 +80,6 @@ AlignWidget::AlignWidget(QWidget* const parent)
     const auto hCenterButton = new QPushButton(this);
     hCenterButton->setFocusPolicy(Qt::NoFocus);
     hCenterButton->setIcon(QIcon::fromTheme("pivot-align-hcenter"));
-    hCenterButton->setIconSize(QSize(buttonSize, buttonSize));
     hCenterButton->setToolTip(tr("Align Horizontal Center"));
     connect(hCenterButton, &QPushButton::pressed, this, [this]() {
         triggerAlign(Qt::AlignHCenter);
@@ -92,7 +89,6 @@ AlignWidget::AlignWidget(QWidget* const parent)
     const auto rightButton = new QPushButton(this);
     rightButton->setFocusPolicy(Qt::NoFocus);
     rightButton->setIcon(QIcon::fromTheme("pivot-align-right"));
-    rightButton->setIconSize(QSize(buttonSize, buttonSize));
     rightButton->setToolTip(tr("Align Right"));
     connect(rightButton, &QPushButton::pressed, this, [this]() {
         triggerAlign(Qt::AlignRight);
@@ -102,7 +98,6 @@ AlignWidget::AlignWidget(QWidget* const parent)
     const auto topButton = new QPushButton(this);
     topButton->setFocusPolicy(Qt::NoFocus);
     topButton->setIcon(QIcon::fromTheme("pivot-align-top"));
-    topButton->setIconSize(QSize(buttonSize, buttonSize));
     topButton->setToolTip(tr("Align Top"));
     connect(topButton, &QPushButton::pressed, this, [this]() {
         triggerAlign(Qt::AlignTop);
@@ -112,7 +107,6 @@ AlignWidget::AlignWidget(QWidget* const parent)
     const auto vCenterButton = new QPushButton(this);
     vCenterButton->setFocusPolicy(Qt::NoFocus);
     vCenterButton->setIcon(QIcon::fromTheme("pivot-align-vcenter"));
-    vCenterButton->setIconSize(QSize(buttonSize, buttonSize));
     vCenterButton->setToolTip(tr("Align Vertical Center"));
     connect(vCenterButton, &QPushButton::pressed, this, [this]() {
         triggerAlign(Qt::AlignVCenter);
@@ -122,12 +116,21 @@ AlignWidget::AlignWidget(QWidget* const parent)
     const auto bottomButton = new QPushButton(this);
     bottomButton->setFocusPolicy(Qt::NoFocus);
     bottomButton->setIcon(QIcon::fromTheme("pivot-align-bottom"));
-    bottomButton->setIconSize(QSize(buttonSize, buttonSize));
     bottomButton->setToolTip(tr("Align Bottom"));
     connect(bottomButton, &QPushButton::pressed, this, [this]() {
         triggerAlign(Qt::AlignBottom);
     });
     buttonsLay->addWidget(bottomButton);
+
+    if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+        int buttonSize = eSizesUI::widget;
+        leftButton->setIconSize(QSize(buttonSize, buttonSize));
+        hCenterButton->setIconSize(QSize(buttonSize, buttonSize));
+        rightButton->setIconSize(QSize(buttonSize, buttonSize));
+        topButton->setIconSize(QSize(buttonSize, buttonSize));
+        vCenterButton->setIconSize(QSize(buttonSize, buttonSize));
+        bottomButton->setIconSize(QSize(buttonSize, buttonSize));
+    }
 }
 
 void AlignWidget::triggerAlign(const Qt::Alignment align)

diff --git a/src/ui/widgets/assetswidget.cpp b/src/ui/widgets/assetswidget.cpp
@@ -53,7 +53,9 @@ AssetsTreeWidget::AssetsTreeWidget(QWidget *parent)
     header()->setStretchLastSection(true);
     setContextMenuPolicy(Qt::CustomContextMenu);
     eSizesUI::widget.add(this, [this](const int size) {
-        setIconSize(QSize(size, size));
+        if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+            setIconSize(QSize(size, size));
+        }
     });
 }
 

diff --git a/src/ui/widgets/fakemenubar.cpp b/src/ui/widgets/fakemenubar.cpp
@@ -31,13 +31,17 @@
 #include <QPushButton>
 #include <QFrame>
 
+#include "Private/esettings.h"
+
 class QActionButton : public QPushButton {
 public:
     explicit QActionButton(QWidget *parent = nullptr) :
         QPushButton(parent) {
         eSizesUI::widget.add(this, [this](const int size) {
             setFixedHeight(size);
-            //setIconSize(QSize(size, size));
+            if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
+                setIconSize(QSize(size, size));
+            }
         });
         //setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         setObjectName("QActionButton");