diff options
Diffstat (limited to 'src/core/touch_selection_menu_controller.cpp')
| -rw-r--r-- | src/core/touch_selection_menu_controller.cpp | 69 |
1 files changed, 22 insertions, 47 deletions
diff --git a/src/core/touch_selection_menu_controller.cpp b/src/core/touch_selection_menu_controller.cpp index cdec9a064..98481baf0 100644 --- a/src/core/touch_selection_menu_controller.cpp +++ b/src/core/touch_selection_menu_controller.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine 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) 2018 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 "touch_selection_controller_client_qt.h" #include "touch_selection_menu_controller.h" @@ -53,17 +17,11 @@ TouchSelectionMenuController::~TouchSelectionMenuController() int TouchSelectionMenuController::buttonCount() { - int buttonCount = 1; - - for (int commandId = 0; commandId <= static_cast<int>(Paste); ++commandId) { - if (m_touchSelectionControllerClient->IsCommandIdEnabled(commandId)) - buttonCount++; - } - - return buttonCount; + // Context menu should be always available + return qPopulationCount(static_cast<quint8>(availableActions())) + 1; } -bool TouchSelectionMenuController::isCommandEnabled(TouchSelectionCommand command) +bool TouchSelectionMenuController::isCommandEnabled(TouchSelectionMenuController::TouchSelectionCommandFlag command) { return m_touchSelectionControllerClient->IsCommandIdEnabled(static_cast<int>(command)); } @@ -88,4 +46,21 @@ void TouchSelectionMenuController::runContextMenu() return m_touchSelectionControllerClient->RunContextMenu(); } +TouchSelectionMenuController::TouchSelectionCommandFlags TouchSelectionMenuController::availableActions() +{ + TouchSelectionCommandFlags availableActions; + + if (m_touchSelectionControllerClient->IsCommandIdEnabled(Cut)) { + availableActions |= TouchSelectionMenuController::Cut; + } + if (m_touchSelectionControllerClient->IsCommandIdEnabled(Copy)) { + availableActions |= TouchSelectionMenuController::Copy; + } + if (m_touchSelectionControllerClient->IsCommandIdEnabled(Paste)) { + availableActions |= TouchSelectionMenuController::Paste; + } + + return availableActions; +} + } // namespace QtWebEngineCore |