From 59ee09172207d383843edd6d0e2829c4a23d10cd Mon Sep 17 00:00:00 2001 From: fourtf Date: Sun, 24 Jun 2018 18:30:48 +0200 Subject: [PATCH] fixed label ui scale --- src/widgets/helper/notebooktab.cpp | 10 ++++------ src/widgets/label.cpp | 10 ++++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/widgets/helper/notebooktab.cpp b/src/widgets/helper/notebooktab.cpp index 1ab100300..c615c9e8e 100644 --- a/src/widgets/helper/notebooktab.cpp +++ b/src/widgets/helper/notebooktab.cpp @@ -213,12 +213,10 @@ void NotebookTab::paintEvent(QPaintEvent *) QPainter painter(this); float scale = this->getScale(); - qDebug() << painter.device()->devicePixelRatioF() << painter.device()->devicePixelRatioFScale() - << painter.device()->logicalDpiX(); - - painter.setFont(getApp()->fonts->getFont(FontStyle::UiTabs, scale * this->devicePixelRatioF())); - QFontMetrics metrics = - app->fonts->getFontMetrics(FontStyle::UiTabs, scale * this->devicePixelRatioF()); + painter.setFont(getApp()->fonts->getFont( + FontStyle::UiTabs, scale * 96.f / this->logicalDpiX() * this->devicePixelRatioF())); + QFontMetrics metrics = app->fonts->getFontMetrics( + FontStyle::UiTabs, scale * 96.f / this->logicalDpiX() * this->devicePixelRatioF()); int height = int(scale * NOTEBOOK_TAB_HEIGHT); // int fullHeight = (int)(scale * 48); diff --git a/src/widgets/label.cpp b/src/widgets/label.cpp index 204f66556..0e6ef8b42 100644 --- a/src/widgets/label.cpp +++ b/src/widgets/label.cpp @@ -89,10 +89,12 @@ void Label::paintEvent(QPaintEvent *) auto app = getApp(); QPainter painter(this); - QFontMetrics metrics = app->fonts->getFontMetrics(this->getFontStyle(), - this->getScale() * this->devicePixelRatioF()); - painter.setFont( - app->fonts->getFont(this->getFontStyle(), this->getScale() * this->devicePixelRatioF())); + QFontMetrics metrics = app->fonts->getFontMetrics( + this->getFontStyle(), + this->getScale() * 96.f / this->logicalDpiX() * this->devicePixelRatioF()); + painter.setFont(app->fonts->getFont( + this->getFontStyle(), + this->getScale() * 96.f / this->logicalDpiX() * this->devicePixelRatioF())); int offset = this->getOffset();