From f5bdd92e5d0217bf3eec13395e4baa95bd8fda37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Wed, 3 Jun 2015 12:58:23 +0200 Subject: Move min/max size constrain logic to QPlatformWindow. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/gui/kernel/qhighdpiscaling_p.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/gui/kernel/qhighdpiscaling_p.h') 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); -- cgit v1.2.3