Basic DPI scale

mhtvsSFrpHdE · Aug 31, 2022 · dd58187 · dd58187
1 parent d982f3a
commit dd58187
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 8 deletions.
diff --git a/qpp/prefetch/Source/Interface/Dpi/dpi.cpp b/qpp/prefetch/Source/Interface/Dpi/dpi.cpp
@@ -1,5 +1,6 @@
 #include <boost/math/special_functions/round.hpp>
 #include <cmath>
+#include <QWidget>
 
 #include "dpi.h"
 #include "..\..\Setting\setting.h"
@@ -9,8 +10,8 @@ using boost::multiprecision::cpp_bin_float_single;
 cpp_bin_float_single Dpi::zoomLevel;
 const cpp_bin_float_single Dpi::percentage = 100;
 
-cpp_bin_float_single Dpi::dpiMultiplyer;
-cpp_bin_float_single Dpi::pointToPixelMultiplyer;
+cpp_bin_float_single Dpi::dpiMultiplier;
+cpp_bin_float_single Dpi::pointToPixelMultiplier;
 
 const cpp_bin_float_single Dpi::assumeQtPointEachInch = 72;
 const cpp_bin_float_single Dpi::assumeOsPointEachInch = 96;
@@ -32,8 +33,8 @@ void Dpi::init()
     }
 
     // Ratio
-    dpiMultiplyer = zoomLevel / percentage;
-    pointToPixelMultiplyer = assumeQtPointEachInch / assumeOsPointEachInch;
+    dpiMultiplier = zoomLevel / percentage;
+    pointToPixelMultiplier = assumeQtPointEachInch / assumeOsPointEachInch;
 
     // Font size
     auto getFontSize = Setting::getInt("Instance", "FontSize", Setting::setting);
@@ -53,10 +54,32 @@ int Dpi::ptToPx(int pt)
     // Parse input to float
     cpp_bin_float_single floatPt = pt;
     // Convert point to pixel
-    cpp_bin_float_single floatResult = floatPt / pointToPixelMultiplyer;
+    cpp_bin_float_single floatResult = floatPt / pointToPixelMultiplier;
     // DPI scale
-    floatResult = floatResult * dpiMultiplyer;
+    floatResult = floatResult * dpiMultiplier;
 
     int result_floor = std::floor(floatResult.convert_to<float>());
     return result_floor;
 }
+
+int Dpi::multiply(int number)
+{
+    cpp_bin_float_single floatResult = number;
+
+    floatResult = floatResult * dpiMultiplier;
+
+    int result_floor = std::floor(floatResult.convert_to<float>());
+    return result_floor;
+};
+
+void Dpi::scale_qWidgetRect(QWidget *widget)
+{
+    auto qRect = widget->geometry();
+
+    auto newX = multiply(qRect.x());
+    auto newY = multiply(qRect.y());
+    auto newWidth = multiply(qRect.width());
+    auto newHeight = multiply(qRect.height());
+
+    widget->setGeometry(newX, newY, newWidth, newHeight);
+}
diff --git a/qpp/prefetch/Source/Interface/Dpi/dpi.h b/qpp/prefetch/Source/Interface/Dpi/dpi.h
@@ -15,6 +15,12 @@ class Dpi
     // https://accessibility.psu.edu/legibility/fontsize
     static int ptToPx(int pt);
 
+    // Multiply number with dpiMultiplier
+    static int multiply(int number);
+
+    // Try scale object inherted from QWidget and QRect
+    static void scale_qWidgetRect(QWidget *widget);
+
     // Default font pixel size, convert from point size in config
     static int defaultFontSize_pixel;
 
@@ -25,10 +31,12 @@ class Dpi
     static cpp_bin_float_single zoomLevel;
     const static cpp_bin_float_single percentage;
 
-    static cpp_bin_float_single dpiMultiplyer;
-    static cpp_bin_float_single pointToPixelMultiplyer;
+    static cpp_bin_float_single dpiMultiplier;
+    static cpp_bin_float_single pointToPixelMultiplier;
 
+    // It seems Qt use 1/72 as internal dpi calculation
     const static cpp_bin_float_single assumeQtPointEachInch;
+    // But Windows use 96/1 as internal dpi calculation
     const static cpp_bin_float_single assumeOsPointEachInch;
 
     static int defaultFontSize_point;

diff --git a/qpp/prefetch/Source/Interface/MainWindow/mainwindow.cpp b/qpp/prefetch/Source/Interface/MainWindow/mainwindow.cpp
@@ -5,6 +5,7 @@
 #include "ui_mainwindow.h"
 #include "..\..\Global\global.h"
 #include "..\..\Setting\setting.h"
+#include "..\Dpi\dpi.h"
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
                                           ui(new Ui::MainWindow)
@@ -16,6 +17,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     startToTray = Setting::getBool("Instance", "StartToTray", Setting::setting);
     minimizeToTray = Setting::getBool("Instance", "MinimizeToTray", Setting::setting);
 
+    // Zoom
+    Dpi::scale_qWidgetRect(this);
+    Dpi::scale_qWidgetRect(ui->stdOut_plainTextEdit);
+    Dpi::scale_qWidgetRect(ui->command_lineEdit);
+    Dpi::scale_qWidgetRect(ui->sendCommand_pushButton);
+
     // Log size limit to prevent memory leak
     auto getMaximumBlockCount = Setting::getInt("Instance", "MaximumBlockCount", Setting::setting);
     if (getMaximumBlockCount.success)