Windows Accessibility: Add UI Automation Window provider
This allows closing, minimizing and maximizing the window. Fixes: QTBUG-74999 Change-Id: I8b3ad806a1767586c8cf7e5a1848fc0e525621cd Reviewed-by: André de la Rocha <andre.rocha@qt.io>
This commit is contained in:
parent
5e743adc20
commit
516ab2a595
@ -360,4 +360,27 @@ __CRT_UUID_DECL(IGridItemProvider, 0xd02541f1, 0xfb81, 0x4d64, 0xae,0x32, 0xf5,0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef __IWindowProvider_INTERFACE_DEFINED__
|
||||
#define __IWindowProvider_INTERFACE_DEFINED__
|
||||
DEFINE_GUID(IID_IWindowProvider, 0x987df77b, 0xdb06, 0x4d77, 0x8f,0x8a, 0x86,0xa9,0xc3,0xbb,0x90,0xb9);
|
||||
MIDL_INTERFACE("987df77b-db06-4d77-8f8a-86a9c3bb90b9")
|
||||
IWindowProvider : public IUnknown
|
||||
{
|
||||
public:
|
||||
virtual HRESULT STDMETHODCALLTYPE SetVisualState(enum WindowVisualState state) = 0;
|
||||
virtual HRESULT STDMETHODCALLTYPE Close( void) = 0;
|
||||
virtual HRESULT STDMETHODCALLTYPE WaitForInputIdle(int milliseconds, __RPC__out BOOL *pRetVal) = 0;
|
||||
virtual HRESULT STDMETHODCALLTYPE get_CanMaximize(__RPC__out BOOL *pRetVal) = 0;
|
||||
virtual HRESULT STDMETHODCALLTYPE get_CanMinimize(__RPC__out BOOL *pRetVal) = 0;
|
||||
virtual HRESULT STDMETHODCALLTYPE get_IsModal(__RPC__out BOOL *pRetVal) = 0;
|
||||
virtual HRESULT STDMETHODCALLTYPE get_WindowVisualState(__RPC__out enum WindowVisualState *pRetVal) = 0;
|
||||
virtual HRESULT STDMETHODCALLTYPE get_WindowInteractionState(__RPC__out enum WindowInteractionState *pRetVal) = 0;
|
||||
virtual HRESULT STDMETHODCALLTYPE get_IsTopmost(__RPC__out BOOL *pRetVal) = 0;
|
||||
};
|
||||
#ifdef __CRT_UUID_DECL
|
||||
__CRT_UUID_DECL(IWindowProvider, 0x987df77b, 0xdb06, 0x4d77, 0x8f,0x8a, 0x86,0xa9,0xc3,0xbb,0x90,0xb9)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -141,6 +141,20 @@ enum PropertyConditionFlags {
|
||||
PropertyConditionFlags_IgnoreCase = 1
|
||||
};
|
||||
|
||||
enum WindowVisualState {
|
||||
WindowVisualState_Normal = 0,
|
||||
WindowVisualState_Maximized = 1,
|
||||
WindowVisualState_Minimized = 2
|
||||
};
|
||||
|
||||
enum WindowInteractionState {
|
||||
WindowInteractionState_Running = 0,
|
||||
WindowInteractionState_Closing = 1,
|
||||
WindowInteractionState_ReadyForUserInteraction = 2,
|
||||
WindowInteractionState_BlockedByModalWindow = 3,
|
||||
WindowInteractionState_NotResponding = 4
|
||||
};
|
||||
|
||||
struct UiaRect {
|
||||
double left;
|
||||
double top;
|
||||
|
@ -52,6 +52,7 @@
|
||||
#include "qwindowsuiatableitemprovider.h"
|
||||
#include "qwindowsuiagridprovider.h"
|
||||
#include "qwindowsuiagriditemprovider.h"
|
||||
#include "qwindowsuiawindowprovider.h"
|
||||
#include "qwindowscombase.h"
|
||||
#include "qwindowscontext.h"
|
||||
#include "qwindowsuiautils.h"
|
||||
@ -263,6 +264,11 @@ HRESULT QWindowsUiaMainProvider::GetPatternProvider(PATTERNID idPattern, IUnknow
|
||||
return UIA_E_ELEMENTNOTAVAILABLE;
|
||||
|
||||
switch (idPattern) {
|
||||
case UIA_WindowPatternId:
|
||||
if (accessible->parent() && (accessible->parent()->role() == QAccessible::Application)) {
|
||||
*pRetVal = new QWindowsUiaWindowProvider(id());
|
||||
}
|
||||
break;
|
||||
case UIA_TextPatternId:
|
||||
case UIA_TextPattern2Id:
|
||||
// All text controls.
|
||||
|
@ -0,0 +1,168 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2019 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 3 requirements
|
||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 2.0 or (at your option) the GNU General
|
||||
** Public license version 3 or any later version approved by the KDE Free
|
||||
** Qt Foundation. The licenses are as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtGui/qtguiglobal.h>
|
||||
#if QT_CONFIG(accessibility)
|
||||
|
||||
#include "qwindowsuiawindowprovider.h"
|
||||
#include "qwindowsuiautils.h"
|
||||
#include "qwindowscontext.h"
|
||||
|
||||
#include <QtGui/qaccessible.h>
|
||||
#include <QtGui/private/qwindow_p.h>
|
||||
#include <QtCore/qloggingcategory.h>
|
||||
#include <QtCore/qstring.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
using namespace QWindowsUiAutomation;
|
||||
|
||||
|
||||
QWindowsUiaWindowProvider::QWindowsUiaWindowProvider(QAccessible::Id id) :
|
||||
QWindowsUiaBaseProvider(id)
|
||||
{
|
||||
}
|
||||
|
||||
QWindowsUiaWindowProvider::~QWindowsUiaWindowProvider()
|
||||
{
|
||||
}
|
||||
|
||||
HRESULT STDMETHODCALLTYPE QWindowsUiaWindowProvider::SetVisualState(WindowVisualState state) {
|
||||
qCDebug(lcQpaUiAutomation) << __FUNCTION__;
|
||||
QAccessibleInterface *accessible = accessibleInterface();
|
||||
if (!accessible || !accessible->window())
|
||||
return UIA_E_ELEMENTNOTAVAILABLE;
|
||||
auto window = accessible->window();
|
||||
switch (state) {
|
||||
case WindowVisualState_Normal:
|
||||
window->showNormal();
|
||||
break;
|
||||
case WindowVisualState_Maximized:
|
||||
window->showMaximized();
|
||||
break;
|
||||
case WindowVisualState_Minimized:
|
||||
window->showMinimized();
|
||||
break;
|
||||
}
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT STDMETHODCALLTYPE QWindowsUiaWindowProvider::Close() {
|
||||
qCDebug(lcQpaUiAutomation) << __FUNCTION__;
|
||||
QAccessibleInterface *accessible = accessibleInterface();
|
||||
if (!accessible || !accessible->window())
|
||||
return UIA_E_ELEMENTNOTAVAILABLE;
|
||||
accessible->window()->close();
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT STDMETHODCALLTYPE QWindowsUiaWindowProvider::WaitForInputIdle(int milliseconds, __RPC__out BOOL *pRetVal) {
|
||||
Q_UNUSED(milliseconds);
|
||||
Q_UNUSED(pRetVal);
|
||||
return UIA_E_NOTSUPPORTED;
|
||||
}
|
||||
|
||||
HRESULT STDMETHODCALLTYPE QWindowsUiaWindowProvider::get_CanMaximize(__RPC__out BOOL *pRetVal) {
|
||||
qCDebug(lcQpaUiAutomation) << __FUNCTION__;
|
||||
QAccessibleInterface *accessible = accessibleInterface();
|
||||
if (!accessible || !accessible->window())
|
||||
return UIA_E_ELEMENTNOTAVAILABLE;
|
||||
|
||||
auto window = accessible->window();
|
||||
auto flags = window->flags();
|
||||
|
||||
*pRetVal = (!(flags & Qt::MSWindowsFixedSizeDialogHint)
|
||||
&& (flags & Qt::WindowMaximizeButtonHint)
|
||||
&& ((flags & Qt::CustomizeWindowHint)
|
||||
|| window->maximumSize() == QSize(QWINDOWSIZE_MAX, QWINDOWSIZE_MAX)));
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT STDMETHODCALLTYPE QWindowsUiaWindowProvider::get_CanMinimize(__RPC__out BOOL *pRetVal) {
|
||||
qCDebug(lcQpaUiAutomation) << __FUNCTION__;
|
||||
QAccessibleInterface *accessible = accessibleInterface();
|
||||
if (!accessible || !accessible->window())
|
||||
return UIA_E_ELEMENTNOTAVAILABLE;
|
||||
*pRetVal = accessible->window()->flags() & Qt::WindowMinimizeButtonHint;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT STDMETHODCALLTYPE QWindowsUiaWindowProvider::get_IsModal(__RPC__out BOOL *pRetVal) {
|
||||
qCDebug(lcQpaUiAutomation) << __FUNCTION__;
|
||||
QAccessibleInterface *accessible = accessibleInterface();
|
||||
if (!accessible || !accessible->window())
|
||||
return UIA_E_ELEMENTNOTAVAILABLE;
|
||||
*pRetVal = accessible->window()->isModal();
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT STDMETHODCALLTYPE QWindowsUiaWindowProvider::get_WindowVisualState(__RPC__out enum WindowVisualState *pRetVal) {
|
||||
qCDebug(lcQpaUiAutomation) << __FUNCTION__;
|
||||
QAccessibleInterface *accessible = accessibleInterface();
|
||||
if (!accessible || !accessible->window())
|
||||
return UIA_E_ELEMENTNOTAVAILABLE;
|
||||
auto visibility = accessible->window()->visibility();
|
||||
switch (visibility) {
|
||||
case QWindow::FullScreen:
|
||||
case QWindow::Maximized:
|
||||
*pRetVal = WindowVisualState_Maximized;
|
||||
break;
|
||||
case QWindow::Minimized:
|
||||
*pRetVal = WindowVisualState_Minimized;
|
||||
break;
|
||||
default:
|
||||
*pRetVal = WindowVisualState_Normal;
|
||||
break;
|
||||
}
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT STDMETHODCALLTYPE QWindowsUiaWindowProvider::get_WindowInteractionState(__RPC__out enum WindowInteractionState *pRetVal) {
|
||||
Q_UNUSED(pRetVal);
|
||||
return UIA_E_NOTSUPPORTED;
|
||||
}
|
||||
|
||||
HRESULT STDMETHODCALLTYPE QWindowsUiaWindowProvider::get_IsTopmost(__RPC__out BOOL *pRetVal) {
|
||||
Q_UNUSED(pRetVal);
|
||||
return UIA_E_NOTSUPPORTED;
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_CONFIG(accessibility)
|
@ -0,0 +1,73 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2019 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 3 requirements
|
||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 2.0 or (at your option) the GNU General
|
||||
** Public license version 3 or any later version approved by the KDE Free
|
||||
** Qt Foundation. The licenses are as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QWINDOWSUIAWINDOWPROVIDER_H
|
||||
#define QWINDOWSUIAWINDOWPROVIDER_H
|
||||
|
||||
#include <QtGui/qtguiglobal.h>
|
||||
#if QT_CONFIG(accessibility)
|
||||
|
||||
#include "qwindowsuiabaseprovider.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QWindowsUiaWindowProvider : public QWindowsUiaBaseProvider,
|
||||
public QWindowsComBase<IWindowProvider>
|
||||
{
|
||||
Q_DISABLE_COPY(QWindowsUiaWindowProvider)
|
||||
public:
|
||||
explicit QWindowsUiaWindowProvider(QAccessible::Id id);
|
||||
~QWindowsUiaWindowProvider() override;
|
||||
|
||||
HRESULT STDMETHODCALLTYPE SetVisualState(WindowVisualState state) override;
|
||||
HRESULT STDMETHODCALLTYPE Close( void) override;
|
||||
HRESULT STDMETHODCALLTYPE WaitForInputIdle(int milliseconds, __RPC__out BOOL *pRetVal) override;
|
||||
HRESULT STDMETHODCALLTYPE get_CanMaximize(__RPC__out BOOL *pRetVal) override;
|
||||
HRESULT STDMETHODCALLTYPE get_CanMinimize(__RPC__out BOOL *pRetVal) override;
|
||||
HRESULT STDMETHODCALLTYPE get_IsModal(__RPC__out BOOL *pRetVal) override;
|
||||
HRESULT STDMETHODCALLTYPE get_WindowVisualState(__RPC__out WindowVisualState *pRetVal) override;
|
||||
HRESULT STDMETHODCALLTYPE get_WindowInteractionState(__RPC__out WindowInteractionState *pRetVal) override;
|
||||
HRESULT STDMETHODCALLTYPE get_IsTopmost(__RPC__out BOOL *pRetVal) override;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_CONFIG(accessibility)
|
||||
|
||||
#endif // QWINDOWSUIAWINDOWPROVIDER_H
|
@ -18,6 +18,7 @@ SOURCES += \
|
||||
$$PWD/qwindowsuiatableitemprovider.cpp \
|
||||
$$PWD/qwindowsuiagridprovider.cpp \
|
||||
$$PWD/qwindowsuiagriditemprovider.cpp \
|
||||
$$PWD/qwindowsuiawindowprovider.cpp \
|
||||
$$PWD/qwindowsuiautils.cpp
|
||||
|
||||
HEADERS += \
|
||||
@ -37,6 +38,7 @@ HEADERS += \
|
||||
$$PWD/qwindowsuiatableitemprovider.h \
|
||||
$$PWD/qwindowsuiagridprovider.h \
|
||||
$$PWD/qwindowsuiagriditemprovider.h \
|
||||
$$PWD/qwindowsuiawindowprovider.h \
|
||||
$$PWD/qwindowsuiautils.h
|
||||
|
||||
mingw: LIBS *= -luuid
|
||||
|
Loading…
Reference in New Issue
Block a user