1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for _q_platform_qnxWindowType QWindow property

Browse Source 
This dynamic property can be used to specify an explicit QNX window
type for a QNX platform window.  The _q_platform_ prefix makes it
possible to place the property on QWidget objects instead.  Existing
functionality ensures that any QWidget property whose name begins with
_q_platform_ is copied to the underlying QWindow object prior to
creation of the platform window.

Add _q_platform_ aliases for the dynamic qnxInitialWindowGroup and
qnxWindowId properties so that these properties can be also be
specified on QWidget objects.

Change-Id: Ia37a965dd25de333307b2bb5ae81446db271af1f
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Dan Cape <dcape@qnx.com>
This commit is contained in:
James McDonnell 2018-04-27 14:23:54 -04:00
parent 59df474e13
commit c23f23a739
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/qnx/qqnxwindow.cpp
View File

@ -174,7 +174,9 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW
// If a qnxInitialWindowGroup property is set on the window we'll take this as an // If a qnxInitialWindowGroup property is set on the window we'll take this as an
// indication that we want to create a child window and join that window group. // indication that we want to create a child window and join that window group.
const QVariant windowGroup = window->property("qnxInitialWindowGroup"); QVariant windowGroup = window->property("qnxInitialWindowGroup");
if (!windowGroup.isValid())
windowGroup = window->property("_q_platform_qnxParentGroup");
if (window->type() == Qt::CoverWindow) { if (window->type() == Qt::CoverWindow) {
// Cover windows have to be top level to be accessible to window delegate (i.e. navigator) // Cover windows have to be top level to be accessible to window delegate (i.e. navigator)
@ -194,7 +196,12 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW
if (window->type() == Qt::Desktop) // A desktop widget does not need a libscreen window if (window->type() == Qt::Desktop) // A desktop widget does not need a libscreen window
return; return;
if (m_isTopLevel) { QVariant type = window->property("_q_platform_qnxWindowType");
if (type.isValid() && type.canConvert<int>()) {
Q_SCREEN_CHECKERROR(
screen_create_window_type(&m_window, m_screenContext, type.value<int>()),
"Could not create window");
} else if (m_isTopLevel) {
Q_SCREEN_CRITICALERROR(screen_create_window(&m_window, m_screenContext), Q_SCREEN_CRITICALERROR(screen_create_window(&m_window, m_screenContext),
"Could not create top level window"); // Creates an application window "Could not create top level window"); // Creates an application window
if (window->type() != Qt::CoverWindow) { if (window->type() != Qt::CoverWindow) {
@ -212,7 +219,9 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW
// If the window has a qnxWindowId property, set this as the string id property. This generally // If the window has a qnxWindowId property, set this as the string id property. This generally
// needs to be done prior to joining any group as it might be used by the owner of the // needs to be done prior to joining any group as it might be used by the owner of the
// group to identify the window. // group to identify the window.
const QVariant windowId = window->property("qnxWindowId"); QVariant windowId = window->property("qnxWindowId");
if (!windowId.isValid())
windowId = window->property("_q_platform_qnxWindowId");
if (windowId.isValid() && windowId.canConvert<QByteArray>()) { if (windowId.isValid() && windowId.canConvert<QByteArray>()) {
QByteArray id = windowId.toByteArray(); QByteArray id = windowId.toByteArray();
Q_SCREEN_CHECKERROR(screen_set_window_property_cv(m_window, SCREEN_PROPERTY_ID_STRING, Q_SCREEN_CHECKERROR(screen_set_window_property_cv(m_window, SCREEN_PROPERTY_ID_STRING,