diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-02-03 23:03:29 +0100 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-10-20 07:26:46 +0200 |
commit | f4a66e5c4c4be97a7511b372930e20f330ea0813 (patch) | |
tree | 013880c3a0f5084b017962310208448a761632cf /src/plugins/platforms/offscreen/qoffscreenwindow.h | |
parent | 0ab89881c5aecc31e44fd83b1a63bd4de52ebe4a (diff) |
QPA offscreen: make platform plugin configurable
Add ability to load a json config file containing screen
configuration at startup. The config file location
is specified using platform options:
-platform offscfreen:configfile=/path/to/file
Config file format example:
{
“screens”: [
{
"name", "screen-1",
"x", 0,
"y", 0,
"width", 640,
"height", 480,
"dpi", 96,
"dpr", 1,
},
…
]
}
Change-Id: Iac21aaafa6d0f361bdd6f6e9168b7e68db6ae011
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/platforms/offscreen/qoffscreenwindow.h')
-rw-r--r-- | src/plugins/platforms/offscreen/qoffscreenwindow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/offscreen/qoffscreenwindow.h b/src/plugins/platforms/offscreen/qoffscreenwindow.h index e1f37bb034..32b8ca33cb 100644 --- a/src/plugins/platforms/offscreen/qoffscreenwindow.h +++ b/src/plugins/platforms/offscreen/qoffscreenwindow.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QOffscreenWindow : public QPlatformWindow { public: - QOffscreenWindow(QWindow *window); + QOffscreenWindow(QWindow *window, bool frameMarginsEnabled); ~QOffscreenWindow(); void setGeometry(const QRect &rect) override; @@ -74,6 +74,7 @@ private: bool m_positionIncludesFrame; bool m_visible; bool m_pendingGeometryChangeOnShow; + bool m_frameMarginsRequested; WId m_winId; static QHash<WId, QOffscreenWindow *> m_windowForWinIdHash; |