Fix HiDPI #68

friction2d · Sep 10, 2023 · e6de2d8 · e6de2d8
1 parent 9eb1559
commit e6de2d8
Show file tree

Hide file tree

Showing 7 changed files with 2,297 additions and 18 deletions.
diff --git a/src/app/GUI/GradientWidgets/gradientslistwidget.cpp b/src/app/GUI/GradientWidgets/gradientslistwidget.cpp
@@ -51,9 +51,9 @@ void GradientsListWidget::resizeEvent(QResizeEvent *e) {
     const QSize size = e->size();
     mDisplayedGradients->setMinimumHeight(size.height());
     mDisplayedGradients->updateHeight();
-    const int scrollBarWidth = verticalScrollBar()->width();
+    /*const int scrollBarWidth = verticalScrollBar()->width();
     const int availableWidth = size.width() - scrollBarWidth;
-    mDisplayedGradients->setFixedWidth(availableWidth);
+    mDisplayedGradients->setFixedWidth(availableWidth);*/
 }
 
 void GradientsListWidget::showEvent(QShowEvent *e) {

diff --git a/src/app/GUI/alignwidget.cpp b/src/app/GUI/alignwidget.cpp
@@ -29,6 +29,8 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 
+#include "GUI/global.h"
+
 AlignWidget::AlignWidget(QWidget* const parent)
     : QWidget(parent)
     , mAlignPivot(nullptr)
@@ -47,13 +49,15 @@ AlignWidget::AlignWidget(QWidget* const parent)
 
     combosLay->addWidget(new QLabel(tr("Align")));
     mAlignPivot = new QComboBox(this);
+    mAlignPivot->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
     mAlignPivot->setFocusPolicy(Qt::NoFocus);
     mAlignPivot->addItem(tr("Geometry"));
     mAlignPivot->addItem(tr("Pivot"));
     combosLay->addWidget(mAlignPivot);
 
     combosLay->addWidget(new QLabel(tr("Relative to")));
     mRelativeTo = new QComboBox(this);
+    mRelativeTo->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
     mRelativeTo->setFocusPolicy(Qt::NoFocus);
     mRelativeTo->addItem(tr("Scene"));
     mRelativeTo->addItem(tr("Last Selected"));
@@ -63,7 +67,7 @@ AlignWidget::AlignWidget(QWidget* const parent)
     mainLayout->addLayout(buttonsLay);
     mainLayout->addStretch();
 
-    int buttonSize = 20;
+    int buttonSize = eSizesUI::button;
 
     const auto leftButton = new QPushButton(this);
     leftButton->setFocusPolicy(Qt::NoFocus);

diff --git a/src/app/GUI/timelinedockwidget.cpp b/src/app/GUI/timelinedockwidget.cpp
@@ -82,10 +82,6 @@ TimelineDockWidget::TimelineDockWidget(Document& document,
     mMainLayout->setSpacing(0);
     mMainLayout->setMargin(0);
 
-    const QSize iconSize(AppSupport::getSettings("ui",
-                                                 "timelineToolbarIconSize",
-                                                 QSize(24, 24)).toSize());
-
     mFrameRewindAct = new QAction(QIcon::fromTheme("rewind"),
                                   tr("Rewind"),
                                   this);
@@ -203,8 +199,6 @@ TimelineDockWidget::TimelineDockWidget(Document& document,
     mToolBar = new QToolBar(this);
     mToolBar->setMovable(false);
 
-    mToolBar->setIconSize(iconSize);
-
     mRenderProgress = new QProgressBar(this);
     mRenderProgress->setSizePolicy(QSizePolicy::Preferred,
                                    QSizePolicy::Preferred);

diff --git a/src/app/friction.qss b/src/app/friction.qss
@@ -44,7 +44,8 @@ QToolBar#ViewerDrawBar,
 
 QComboBox#blendModeCombo,
 QWidget#menuBarWidget QPushButton,
-QLineEdit#SearchLine {
+QLineEdit#SearchLine,
+AlignWidget QComboBox {
     background-color: rgb(23, 23, 28);
 }
 
@@ -96,13 +97,17 @@ QToolButton#WelcomeOpenButton:hover {
 
 QToolButton#WelcomeOpenButton::menu-button {
     padding-right: 0.5em;
-    border-top-right: 2px solid #ebebeb;
-    border-bottom-right: 2px solid #ebebeb;
     border-top-right-radius: 10%;
     border-bottom-right-radius: 10%;
     color: #ebebeb;
 }
 
 QToolButton#WelcomeOpenButton[popupMode="1"] {
-    padding-right: 0.5em;
+    padding-right: 1em;
+}
+
+AlignWidget QPushButton {
+    background-color: none;
+    border: 0;
+    border-radius: 10%;
 }
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -25,6 +25,7 @@
 #include <QApplication>
 #include <QSurfaceFormat>
 #include <QProcess>
+#include <QDesktopWidget>
 
 #include "hardwareinfo.h"
 #include "Private/esettings.h"
@@ -149,15 +150,17 @@ int main(int argc, char *argv[])
                        HardwareInfo::sGpuVendor());
 
     OS_FONT = QApplication::font();
-    eSizesUI::font.setEvaluator([/*&settings*/]() {
+    eSizesUI::font.setEvaluator([]() {
+        double dpi = (qApp->desktop()->logicalDpiX() / 96.0);
+        qDebug() << "DPI" << dpi;
         const auto fm = QFontMetrics(OS_FONT);
-        const qreal scaling = qBound(0.5, /*settings.fInterfaceScaling*/1.0, 1.5);
+        const qreal scaling = qBound(0.5, dpi, 1.5);
         return qRound(fm.height()*scaling);
     });
     eSizesUI::widget.setEvaluator([]() {
         return eSizesUI::font.size()*4/3;
     });
-    /*QObject::connect(&eSizesUI::font, &SizeSetter::sizeChanged,
+    QObject::connect(&eSizesUI::font, &SizeSetter::sizeChanged,
                      &eSizesUI::widget, &SizeSetter::updateSize);
     eSizesUI::font.add(&app, [&app](const int size) {
         const auto fm = QFontMetrics(OS_FONT);
@@ -169,7 +172,7 @@ int main(int argc, char *argv[])
             font.setPixelSize(qRound(mult*OS_FONT.pixelSize()));
         }
         app.setFont(font);
-    });*/
+    });
 
     eSizesUI::widget.add(&eSizesUI::button, [](const int size) {
         eSizesUI::button.set(qRound(size*1.1));

diff --git a/src/patches/qt/README.md b/src/patches/qt/README.md
@@ -1,4 +1,4 @@
 # Qt 5.12.12 patches
 
-Patches used in releases of Friction.
+Patches used in Windows releases of Friction.