From b930dd608bf95ecc3f89007313ba8ab8b1935ee5 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 1 Aug 2019 11:22:41 +0200 Subject: video: reuse working dpi check --- spline/spline-widget.cpp | 9 --------- spline/spline-widget.hpp | 5 ++--- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'spline') diff --git a/spline/spline-widget.cpp b/spline/spline-widget.cpp index 0ae3766d..e182e45a 100644 --- a/spline/spline-widget.cpp +++ b/spline/spline-widget.cpp @@ -258,15 +258,6 @@ void spline_widget::drawFunction() } } -double spline_widget::screen_dpi() const -{ -#ifdef _WIN32 - return std::max(devicePixelRatioF(), 1.); -#else - return std::max(std::max(logicalDpiX()/(double)physicalDpiX(), devicePixelRatioF()), 1.); -#endif -} - QSize spline_widget::minimumSizeHint() const { const double dpi = screen_dpi(); diff --git a/spline/spline-widget.hpp b/spline/spline-widget.hpp index f1523361..610baf43 100644 --- a/spline/spline-widget.hpp +++ b/spline/spline-widget.hpp @@ -11,6 +11,7 @@ #include "spline.hpp" #include "api/plugin-api.hpp" +#include "compat/qt-dpi.hpp" #include "options/options.hpp" #include "export.hpp" @@ -26,7 +27,7 @@ namespace spline_detail { using namespace options; -class OTR_SPLINE_EXPORT spline_widget final : public QWidget +class OTR_SPLINE_EXPORT spline_widget final : public QWidget, public screen_dpi_mixin { Q_OBJECT Q_PROPERTY(QColor colorBezier READ colorBezier WRITE setColorBezier) @@ -81,8 +82,6 @@ private: void update_range(); void changeEvent(QEvent* e) override; - double screen_dpi() const; - QPointF pixel_to_point(const QPointF& point); QPointF point_to_pixel(const QPointF& point); -- cgit v1.2.3