diff options
| author | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-06-03 12:58:23 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-06-04 10:12:57 +0000 |
| commit | f5bdd92e5d0217bf3eec13395e4baa95bd8fda37 (patch) | |
| tree | da61d04b35ab82bd7adfa701aa47910a27272477 /src/gui/kernel/qhighdpiscaling_p.h | |
| parent | 77162b16ebda05e335291b9917b358d1c129096c (diff) | |
Move min/max size constrain logic to QPlatformWindow.
This increases the uniformity of the to/fromNativePixels
functions by removing a special case, and avoids pulling
the qwindow_p.h details into qhihgdpiscaling.cpp.
Keep the logic of constraining the device-independent
size.
Change-Id: Id0dae30a7c0170ff2e5d21b94d56719cc900c726
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qhighdpiscaling_p.h')
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index 6c96fa2e07..8347214823 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -284,9 +284,6 @@ inline QSize fromNativePixels(const QSize &pixelSize, const QWindow *window) return pixelSize / QHighDpiScaling::factor(window); } -// For converting minimum/maximum sizes of QWindow, limits to 0..QWINDOWSIZE_MAX -Q_GUI_EXPORT QSize toNativePixelsConstrained(const QSize &size, const QWindow *window); - inline QSize toNativePixels(const QSize &pointSize, const QWindow *window) { return pointSize * QHighDpiScaling::factor(window); |