diff options
Diffstat (limited to 'src/widgets/kernel/qshortcut_widgets.cpp')
-rw-r--r-- | src/widgets/kernel/qshortcut_widgets.cpp | 62 |
1 files changed, 16 insertions, 46 deletions
diff --git a/src/widgets/kernel/qshortcut_widgets.cpp b/src/widgets/kernel/qshortcut_widgets.cpp index 9e64376fce..6e25d79bd6 100644 --- a/src/widgets/kernel/qshortcut_widgets.cpp +++ b/src/widgets/kernel/qshortcut_widgets.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qshortcut.h" #include "private/qshortcut_p.h" @@ -101,9 +65,6 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context) } } - if (!active_window) - return false; - #if QT_CONFIG(action) if (auto a = qobject_cast<QAction *>(object)) return correctActionContext(context, a, active_window); @@ -117,7 +78,7 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context) auto w = qobject_cast<QWidget *>(object); if (!w) { if (auto s = qobject_cast<QShortcut *>(object)) - w = s->parentWidget(); + w = qobject_cast<QWidget *>(s->parent()); } if (!w) { @@ -131,14 +92,17 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context) } } - if (!w) - return false; + if (w) + return correctWidgetContext(context, w, active_window); - return correctWidgetContext(context, w, active_window); + return QShortcutPrivate::simpleContextMatcher(object, context); } static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidget *active_window) { + if (!active_window) + return false; + bool visible = w->isVisible(); #if QT_CONFIG(menubar) if (auto menuBar = qobject_cast<QMenuBar *>(w)) { @@ -224,6 +188,9 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge #if QT_CONFIG(graphicsview) static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsWidget *w, QWidget *active_window) { + if (!active_window) + return false; + bool visible = w->isVisible(); #if defined(Q_OS_DARWIN) && QT_CONFIG(menubar) if (!QCoreApplication::testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w)) @@ -283,6 +250,9 @@ static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsW #if QT_CONFIG(action) static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidget *active_window) { + if (!active_window) + return false; + const QObjectList associatedObjects = a->associatedObjects(); #if defined(DEBUG_QSHORTCUTMAP) if (associatedObjects.isEmpty()) @@ -307,7 +277,7 @@ static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidge continue; #endif QAction *a = menu->menuAction(); - if (correctActionContext(context, a, active_window)) + if (a->isVisible() && a->isEnabled() && correctActionContext(context, a, active_window)) return true; } else #endif |