office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-29 20:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Utils::realDpi work on QWindow not on QWidget

Browse source 
Small step towards the goal of okularcore not linking to QWidgets
This commit is contained in:
Albert Astals Cid 2022-01-27 19:24:52 +01:00
parent 5025330a6d
commit 8a36e7350d
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/document.cpp
View file

@ -880,7 +880,8 @@ Document::OpenResult DocumentPrivate::openDocumentInternal(const KPluginMetaData
QApplication::setOverrideCursor(Qt::WaitCursor);
const QSizeF dpi = Utils::realDpi(m_widget);
const QWindow *window = m_widget && m_widget->window() ? m_widget->window()->windowHandle() : nullptr;
const QSizeF dpi = Utils::realDpi(window);
qCDebug(OkularCoreDebug) << "Output DPI:" << dpi;
m_generator->setDPI(dpi);

4
core/utils.cpp
View file

@ -44,9 +44,9 @@ QRect Utils::rotateRect(const QRect source, int width, int height, int orientati
return ret;
}
QSizeF Utils::realDpi(QWidget *widgetOnScreen)
QSizeF Utils::realDpi(const QWindow *windowOnScreen)
{
const QScreen *screen = widgetOnScreen && widgetOnScreen->window() && widgetOnScreen->window()->windowHandle() ? widgetOnScreen->window()->windowHandle()->screen() : qGuiApp->primaryScreen();
const QScreen *screen = windowOnScreen ? windowOnScreen->screen() : qGuiApp->primaryScreen();
if (screen) {
const QSizeF res(screen->physicalDotsPerInchX(), screen->physicalDotsPerInchY());

7
core/utils.h
View file

@ -12,7 +12,6 @@
class QRect;
class QImage;
class QWidget;
namespace Okular
{
@ -31,14 +30,14 @@ public:
static QRect rotateRect(const QRect source, int width, int height, int orientation);
/**
* Return the real DPI of the display containing given widget
* Return the real DPI of the display containing given window
*
* On X11, it can indicate the real horizontal DPI value without any Xrdb
* setting. Otherwise, returns the same as realDpiX/Y(),
*
* @since 0.19 (KDE 4.13)
* @since 22.04
*/
static QSizeF realDpi(QWidget *widgetOnScreen);
static QSizeF realDpi(const QWindow *windowOnScreen);
/**
* Compute the smallest rectangle that contains all non-white pixels in image),