hidpi stuff

friction2d · Aug 11, 2024 · a1ae0b5 · a1ae0b5
1 parent bd9d65d
commit a1ae0b5
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 60 deletions.
diff --git a/src/app/GUI/Expressions/expressiondialog.cpp b/src/app/GUI/Expressions/expressiondialog.cpp
@@ -594,8 +594,9 @@ ExpressionDialog::ExpressionDialog(QrealAnimator* const target,
 
     const int pixSize = eSizesUI::widget/2;
     eSizesUI::widget.add(mBindingsButton, [this](const int size) {
-        mBindingsButton->setFixedHeight(size);
-        mDefinitionsButon->setFixedHeight(size);
+        Q_UNUSED(size)
+        mBindingsButton->setFixedHeight(eSizesUI::button);
+        mDefinitionsButon->setFixedHeight(eSizesUI::button);
     });
 
     QPixmap pix(pixSize, pixSize);

diff --git a/src/app/GUI/RenderWidgets/renderinstancewidget.cpp b/src/app/GUI/RenderWidgets/renderinstancewidget.cpp
@@ -80,7 +80,7 @@ void RenderInstanceWidget::iniGUI() {
     setObjectName("darkWidget");
     mNameLabel = new QLineEdit(this);
     mNameLabel->setFocusPolicy(Qt::NoFocus);
-    mNameLabel->setFixedHeight(eSizesUI::widget);
+    mNameLabel->setFixedHeight(eSizesUI::button);
     mNameLabel->setObjectName("RenderTitleWidget");
     mNameLabel->setReadOnly(true);
     //mNameLabel->setFrame(false);
@@ -176,12 +176,13 @@ void RenderInstanceWidget::iniGUI() {
     mOutputDestinationLineEdit->setObjectName(QString::fromUtf8("OutputDestinationLineEdit"));
 
     eSizesUI::widget.add(mOutputSettingsProfilesButton, [this](const int size) {
-        mRenderSettingsButton->setFixedHeight(size);
-        mOutputSettingsButton->setFixedHeight(size);
-        mOutputSettingsProfilesButton->setFixedSize(QSize(size, size));
-        mOutputDestinationButton->setFixedSize(QSize(size, size));
-        mPlayButton->setFixedSize(QSize(size, size));
-        mOutputDestinationLineEdit->setFixedHeight(size);
+        Q_UNUSED(size)
+        mRenderSettingsButton->setFixedHeight(eSizesUI::button);
+        mOutputSettingsButton->setFixedHeight(eSizesUI::button);
+        mOutputSettingsProfilesButton->setFixedSize(QSize(eSizesUI::button, eSizesUI::button));
+        mOutputDestinationButton->setFixedSize(QSize(eSizesUI::button, eSizesUI::button));
+        mPlayButton->setFixedSize(QSize(eSizesUI::button, eSizesUI::button));
+        mOutputDestinationLineEdit->setFixedHeight(eSizesUI::button);
     });
 
     QWidget *outputDestinationWidget = new QWidget(this);

diff --git a/src/app/GUI/RenderWidgets/renderwidget.cpp b/src/app/GUI/RenderWidgets/renderwidget.cpp
@@ -118,10 +118,11 @@ RenderWidget::RenderWidget(QWidget *parent)
             this, &RenderWidget::clearRenderQueue);
 
     eSizesUI::widget.add(mStartRenderButton, [this](const int size) {
-        mStartRenderButton->setFixedHeight(size);
-        mStopRenderButton->setFixedHeight(size);
-        mAddRenderButton->setFixedHeight(size);
-        mClearQueueButton->setFixedHeight(size);
+        Q_UNUSED(size)
+        mStartRenderButton->setFixedHeight(eSizesUI::button);
+        mStopRenderButton->setFixedHeight(eSizesUI::button);
+        mAddRenderButton->setFixedHeight(eSizesUI::button);
+        mClearQueueButton->setFixedHeight(eSizesUI::button);
     });
 
     mContWidget = new QWidget(this);

diff --git a/src/app/GUI/Settings/settingsdialog.cpp b/src/app/GUI/Settings/settingsdialog.cpp
@@ -73,9 +73,10 @@ SettingsDialog::SettingsDialog(QWidget * const parent)
     eSizesUI::widget.add(restoreButton, [restoreButton,
                                          applyButton,
                                          cancelButton](const int size) {
-        restoreButton->setFixedHeight(size);
-        cancelButton->setFixedHeight(size);
-        applyButton->setFixedHeight(size);
+        Q_UNUSED(size)
+        restoreButton->setFixedHeight(eSizesUI::button);
+        cancelButton->setFixedHeight(eSizesUI::button);
+        applyButton->setFixedHeight(eSizesUI::button);
     });
 
     mainLayout->addLayout(buttonsLayout);

diff --git a/src/app/GUI/fillstrokesettings.cpp b/src/app/GUI/fillstrokesettings.cpp
@@ -256,19 +256,20 @@ FillStrokeSettingsWidget::FillStrokeSettingsWidget(Document &document,
 
     // adjust sizes
     eSizesUI::widget.add(mBevelJoinStyleButton, [this](const int size) {
-        mBevelJoinStyleButton->setFixedHeight(size);
-        mMiterJointStyleButton->setFixedHeight(size);
-        mRoundJoinStyleButton->setFixedHeight(size);
-        mFlatCapStyleButton->setFixedHeight(size);
-        mSquareCapStyleButton->setFixedHeight(size);
-        mRoundCapStyleButton->setFixedHeight(size);
-        mFillTargetButton->setFixedHeight(size);
-        mStrokeTargetButton->setFixedHeight(size);
-        mFillNoneButton->setFixedHeight(size);
-        mFillFlatButton->setFixedHeight(size);
-        mFillGradientButton->setFixedHeight(size);
-        mLinearGradientButton->setFixedHeight(size);
-        mRadialGradientButton->setFixedHeight(size);
+        Q_UNUSED(size)
+        mBevelJoinStyleButton->setFixedHeight(eSizesUI::button);
+        mMiterJointStyleButton->setFixedHeight(eSizesUI::button);
+        mRoundJoinStyleButton->setFixedHeight(eSizesUI::button);
+        mFlatCapStyleButton->setFixedHeight(eSizesUI::button);
+        mSquareCapStyleButton->setFixedHeight(eSizesUI::button);
+        mRoundCapStyleButton->setFixedHeight(eSizesUI::button);
+        mFillTargetButton->setFixedHeight(eSizesUI::button);
+        mStrokeTargetButton->setFixedHeight(eSizesUI::button);
+        mFillNoneButton->setFixedHeight(eSizesUI::button);
+        mFillFlatButton->setFixedHeight(eSizesUI::button);
+        mFillGradientButton->setFixedHeight(eSizesUI::button);
+        mLinearGradientButton->setFixedHeight(eSizesUI::button);
+        mRadialGradientButton->setFixedHeight(eSizesUI::button);
     });
 
     // layout

diff --git a/src/app/GUI/fontswidget.cpp b/src/app/GUI/fontswidget.cpp
@@ -160,12 +160,13 @@ FontsWidget::FontsWidget(QWidget *parent)
             this, [this]() { emit textVAlignmentChanged(Qt::AlignBottom); });
 
     eSizesUI::widget.add(mAlignLeft, [this](const int size) {
-        mAlignLeft->setFixedHeight(size);
-        mAlignCenter->setFixedHeight(size);
-        mAlignRight->setFixedHeight(size);
-        mAlignTop->setFixedHeight(size);
-        mAlignVCenter->setFixedHeight(size);
-        mAlignBottom->setFixedHeight(size);
+        Q_UNUSED(size)
+        mAlignLeft->setFixedHeight(eSizesUI::button);
+        mAlignCenter->setFixedHeight(eSizesUI::button);
+        mAlignRight->setFixedHeight(eSizesUI::button);
+        mAlignTop->setFixedHeight(eSizesUI::button);
+        mAlignVCenter->setFixedHeight(eSizesUI::button);
+        mAlignBottom->setFixedHeight(eSizesUI::button);
     });
 
     mTextInput = new QPlainTextEdit(this);

diff --git a/src/app/GUI/timelinedockwidget.cpp b/src/app/GUI/timelinedockwidget.cpp
@@ -225,15 +225,16 @@ TimelineDockWidget::TimelineDockWidget(Document& document,
     mToolBar->setMovable(false);
 
     mRenderProgress = new QProgressBar(this);
-    mRenderProgress->setSizePolicy(QSizePolicy::Preferred,
-                                   QSizePolicy::Preferred);
-    mRenderProgress->setMinimumWidth(150);
+    mRenderProgress->setSizePolicy(QSizePolicy::Expanding,
+                                   QSizePolicy::Expanding);
+    mRenderProgress->setFixedWidth(mCurrentFrameSpin->width());
     mRenderProgress->setFormat(tr("Cache %p%"));
 
     mToolBar->addWidget(mFrameStartSpin);
 
     eSizesUI::widget.add(mToolBar, [this](const int size) {
-        mRenderProgress->setFixedHeight(size);
+        //mRenderProgress->setFixedHeight(eSizesUI::button);
+        mToolBar->setFixedHeight(eSizesUI::button);
         mToolBar->setIconSize(QSize(size, size));
     });
 

diff --git a/src/app/GUI/toolbox.cpp b/src/app/GUI/toolbox.cpp
@@ -39,9 +39,10 @@ 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));
+        Q_UNUSED(size)
+        mToolBoxMain->setIconSize(QSize(eSizesUI::button, eSizesUI::button));
+        mToolBoxNodes->setIconSize(QSize(eSizesUI::button, eSizesUI::button));
+        mToolBoxDraw->setIconSize(QSize(eSizesUI::button, eSizesUI::button));
     });
 
     mToolBoxMainIndex = mToolBoxStack->addWidget(mToolBoxMain);

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -159,14 +159,9 @@ int main(int argc, char *argv[])
                        HardwareInfo::sRamKB());
 
     OS_FONT = QApplication::font();
-    eSizesUI::font.setEvaluator([&settings]() {
-        qreal dpi = qApp->desktop()->logicalDpiX() / 96.0;
-        settings.fCurrentInterfaceDPI = dpi;
-        qWarning() << "Desktop logicalDpiX:" << dpi;
-        qWarning() << "Desktop PixelRatioF:" << qApp->desktop()->devicePixelRatioF();
+    eSizesUI::font.setEvaluator([]() {
         const auto fm = QFontMetrics(OS_FONT);
-        const qreal scaling = qBound(0.5, dpi, 1.5);
-        return qRound(fm.height()*scaling);
+        return fm.height();
     });
     eSizesUI::widget.setEvaluator([]() {
         return eSizesUI::font.size()*4/3;

diff --git a/src/ui/gradientwidgets/gradientwidget.cpp b/src/ui/gradientwidgets/gradientwidget.cpp
@@ -130,11 +130,12 @@ GradientWidget::GradientWidget(QWidget * const parent)
                           &buttonAdd,
                           &buttonRem,
                           &buttonDup](const int size) {
-        buttonAddColor->setFixedSize(size, size);
-        buttonRemColor->setFixedSize(size, size);
-        buttonAdd->setFixedHeight(size);
-        buttonRem->setFixedHeight(size);
-        buttonDup->setFixedHeight(size);
+        Q_UNUSED(size)
+        buttonAddColor->setFixedSize(eSizesUI::button, eSizesUI::button);
+        buttonRemColor->setFixedSize(eSizesUI::button, eSizesUI::button);
+        buttonAdd->setFixedHeight(eSizesUI::button);
+        buttonRem->setFixedHeight(eSizesUI::button);
+        buttonDup->setFixedHeight(eSizesUI::button);
         /*buttonAddColor->setIconSize(QSize(size, size));
         buttonRemColor->setIconSize(QSize(size, size));
         buttonAdd->setIconSize(QSize(size, size));

diff --git a/src/ui/widgets/alignwidget.cpp b/src/ui/widgets/alignwidget.cpp
@@ -126,12 +126,13 @@ AlignWidget::AlignWidget(QWidget* const parent)
                                       topButton,
                                       vCenterButton,
                                       bottomButton](const int size) {
-        leftButton->setFixedHeight(size);
-        hCenterButton->setFixedHeight(size);
-        rightButton->setFixedHeight(size);
-        topButton->setFixedHeight(size);
-        vCenterButton->setFixedHeight(size);
-        bottomButton->setFixedHeight(size);
+        Q_UNUSED(size)
+        leftButton->setFixedHeight(eSizesUI::button);
+        hCenterButton->setFixedHeight(eSizesUI::button);
+        rightButton->setFixedHeight(eSizesUI::button);
+        topButton->setFixedHeight(eSizesUI::button);
+        vCenterButton->setFixedHeight(eSizesUI::button);
+        bottomButton->setFixedHeight(eSizesUI::button);
     });
 }