diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp index 9f9f8c703..60826a86a 100644 --- a/Telegram/SourceFiles/core/crash_report_window.cpp +++ b/Telegram/SourceFiles/core/crash_report_window.cpp @@ -22,7 +22,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include #include -#include namespace { @@ -44,10 +43,7 @@ PreLaunchWindow::PreLaunchWindow(QString title) { p.setColor(QPalette::Window, QColor(255, 255, 255)); setPalette(p); - const auto dpi = screen()->handle()->logicalDpi().second; - auto font = this->font(); - font.setPixelSize(base::SafeRound(std::floor(font.pointSizeF() * dpi / 72. * 100. + 0.5) / 100.)); - _size = QFontMetrics(font).height(); + _size = QFontMetrics(font()).height(); int paddingVertical = (_size / 2); int paddingHorizontal = _size; diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp index 6273a3ff9..9e9b5a476 100644 --- a/Telegram/SourceFiles/core/sandbox.cpp +++ b/Telegram/SourceFiles/core/sandbox.cpp @@ -31,7 +31,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include #include -#include namespace Core { namespace { @@ -219,11 +218,7 @@ void Sandbox::launchApplication() { } void Sandbox::setupScreenScale() { - constexpr auto processDpi = [](const QDpi &dpi) { - return (dpi.first + dpi.second) * 0.5; - }; - const auto dpi = processDpi( - Sandbox::primaryScreen()->handle()->logicalDpi()); + const auto dpi = Sandbox::primaryScreen()->logicalDotsPerInch(); LOG(("Primary screen DPI: %1").arg(dpi)); if (dpi <= 108) { cSetScreenScale(100); // 100%: 96 DPI (0-108)