summaryrefslogtreecommitdiffstats
path: root/src/platformheaders/windowsfunctions
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-20 13:09:42 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-21 14:14:50 +0200
commit8e48184120f74c02447c8d96408c1c003cd7fd79 (patch)
tree497028e8f49aa8d2dfe8ecdfd4003eff3d538871 /src/platformheaders/windowsfunctions
parentbeab436d77476c93d50d8608c15b369044937d7f (diff)
Start the native interface QWindowsApplication
Implement the static parts of QWindowsWindowFunctions. Move some things around and make them static in tablet support to make this easier. Task-number: QTBUG-83252 Change-Id: I24c3b0b3c6548eb96c4f3285a4e46385a1e79ef5 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/platformheaders/windowsfunctions')
-rw-r--r--src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc108
-rw-r--r--src/platformheaders/windowsfunctions/qwindowswindowfunctions_p.h31
2 files changed, 0 insertions, 139 deletions
diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc
index e782c30ee6..b848df2d09 100644
--- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc
+++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc
@@ -129,111 +129,3 @@
See also \l [QtDoc] {Fullscreen OpenGL Based Windows}
\sa setHasBorderInFullScreen()
*/
-
-/*!
- \enum QWindowsWindowFunctions::WindowActivationBehavior
-
- This enum specifies the behavior of QWidget::activateWindow() and
- QWindow::requestActivate().
-
- \value DefaultActivateWindow The window is activated according to the default
- behavior of the Windows operating system. This means the window will not
- be activated in some circumstances (most notably when the calling process
- is not the active process); only the taskbar entry will be flashed.
- \value AlwaysActivateWindow The window is always activated, even when the
- calling process is not the active process.
-
- \sa QWidget::activateWindow(), QWindow::requestActivate()
- \since 5.7
-*/
-
-/*!
- \typedef QWindowsWindowFunctions::SetWindowActivationBehaviorType
-
- This is the typedef for the function returned by QGuiApplication::platformFunction()
- when passed setWindowActivationBehaviorIdentifier().
-
- \sa QWidget::activateWindow(), QWindow::requestActivate()
- \since 5.7
-*/
-
-/*!
- \fn QByteArray QWindowsWindowFunctions::setWindowActivationBehaviorIdentifier()
-
- This function returns a bytearray that can be used to query
- QGuiApplication::platformFunction() to retrieve the SetWindowActivationBehaviorType
- function.
-
- \sa QWidget::activateWindow(), QWindow::requestActivate()
- \since 5.7
-*/
-
-/*!
- \fn void QWindowsWindowFunctions::setWindowActivationBehavior(WindowActivationBehavior behavior)
-
- This is a convenience function that can be used directly instead of resolving
- the function pointer. \a behavior will be relayed to the function retrieved
- by QGuiApplication.
-
- \sa QWidget::activateWindow(), QWindow::requestActivate()
- \since 5.7
-*/
-
-/*!
- \typedef QWindowsWindowFunctions::IsTabletModeType
-
- This is the typedef for the function returned by QGuiApplication::platformFunction()
- when passed isTabletModeIdentifier().
-
- \since 5.9
-*/
-
-/*!
- \fn QByteArray QWindowsWindowFunctions::isTabletModeIdentifier()
-
- Returns a bytearray that can be used to query
- QGuiApplication::platformFunction() to retrieve the IsTabletModeType
- function.
-
- \since 5.9
-*/
-
-/*!
- \fn bool QWindowsWindowFunctions::isTabletMode()
-
- This is a convenience function that can be used directly instead of resolving
- the function pointer. Returns true if Windows 10 operates in \e{Tablet Mode}.
- In this mode, Windows forces all application main windows to open in maximized
- state. Applications should then avoid resizing windows or restoring geometries
- to non-maximized states.
-
- \sa QWidget::showMaximized(), QWidget::saveGeometry(), QWidget::restoreGeometry()
- \since 5.9
-*/
-
-/*!
- \typedef QWindowsWindowFunctions::SetWinTabEnabled
- \since 6.0
-
- This is the typedef for the function returned by QGuiApplication::platformFunction
- when passed setWinTabEnabledIdentifier().
-*/
-
-/*!
- \fn QByteArray QWindowsWindowFunctions::setWinTabEnabledIdentifier()
- \since 6.0
-
- This function returns the bytearray that can be used to query
- QGuiApplication::platformFunction to retrieve the SetWinTabEnabled function.
-*/
-
-/*!
- \fn bool QWindowsWindowFunctions::setWinTabEnabled(bool enabled)
- \since 6.0
-
- This is a convenience function that can be used directly instead of resolving
- the function pointer.
-
- \a enabled determines whether the WinTab API will be used for tablet input instead
- of the native API. Returns true if the operation was successful.
-*/
diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions_p.h b/src/platformheaders/windowsfunctions/qwindowswindowfunctions_p.h
index 5e8881fc87..6b06b40084 100644
--- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions_p.h
+++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions_p.h
@@ -68,11 +68,6 @@ public:
Q_DECLARE_FLAGS(TouchWindowTouchTypes, TouchWindowTouchType)
- enum WindowActivationBehavior {
- DefaultActivateWindow,
- AlwaysActivateWindow
- };
-
typedef void (*SetTouchWindowTouchType)(QWindow *window, QWindowsWindowFunctions::TouchWindowTouchTypes touchType);
static const QByteArray setTouchWindowTouchTypeIdentifier() { return QByteArrayLiteral("WindowsSetTouchWindowTouchType"); }
@@ -101,32 +96,6 @@ public:
func(border);
}
- typedef void (*SetWindowActivationBehaviorType)(WindowActivationBehavior);
- static const QByteArray setWindowActivationBehaviorIdentifier() { return QByteArrayLiteral("WindowsSetWindowActivationBehavior"); }
-
- static void setWindowActivationBehavior(WindowActivationBehavior behavior)
- {
- SetWindowActivationBehaviorType func = reinterpret_cast<SetWindowActivationBehaviorType>(QGuiApplication::platformFunction(setWindowActivationBehaviorIdentifier()));
- if (func)
- func(behavior);
- }
-
- typedef bool (*IsTabletModeType)();
- static const QByteArray isTabletModeIdentifier() { return QByteArrayLiteral("WindowsIsTabletMode"); }
-
- static bool isTabletMode()
- {
- IsTabletModeType func = reinterpret_cast<IsTabletModeType>(QGuiApplication::platformFunction(isTabletModeIdentifier()));
- return func && func();
- }
-
- typedef bool (*SetWinTabEnabled)(bool enabled);
- static const QByteArray setWinTabEnabledIdentifier() { return QByteArrayLiteral("WindowsSetWinTabEnabled"); }
- static bool setWinTabEnabled(bool enabled)
- {
- SetWinTabEnabled func = reinterpret_cast<SetWinTabEnabled>(QGuiApplication::platformFunction(setWinTabEnabledIdentifier()));
- return func && func(enabled);
- }
};
Q_DECLARE_OPERATORS_FOR_FLAGS(QWindowsWindowFunctions::TouchWindowTouchTypes)