From e02285d01823ded3530cb961d655a780f9a0393a Mon Sep 17 00:00:00 2001 From: Doris Verria Date: Thu, 17 Mar 2022 14:18:51 +0100 Subject: iOS Style: Add Button control Change-Id: I0e764f817aa6708ef4e47e2e98eb595ddb68f0b8 Reviewed-by: Mitch Curtis --- src/quickcontrols2/ios/Button.qml | 81 +++++++++++++++++++++++++++++++++++ src/quickcontrols2/ios/CMakeLists.txt | 1 + 2 files changed, 82 insertions(+) create mode 100644 src/quickcontrols2/ios/Button.qml diff --git a/src/quickcontrols2/ios/Button.qml b/src/quickcontrols2/ios/Button.qml new file mode 100644 index 0000000000..ca603004c3 --- /dev/null +++ b/src/quickcontrols2/ios/Button.qml @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 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$ +** +****************************************************************************/ + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl +import QtQuick.Controls.iOS + +T.Button { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding) + + bottomPadding: 4 + topPadding: 4 + rightPadding: 4 + leftPadding: 4 + + icon.width: 17 + icon.height: 17 + icon.color: control.palette.buttonText + + contentItem: IconLabel { + spacing: control.spacing + mirrored: control.mirrored + display: control.display + + icon: control.icon + text: control.text + font: control.font + color: control.palette.buttonText + } + + background: Rectangle { + implicitHeight: 17 + implicitWidth: 10 + radius: 4 + + visible: !control.flat + color: !control.down ? control.palette.button : control.palette.highlight + } +} diff --git a/src/quickcontrols2/ios/CMakeLists.txt b/src/quickcontrols2/ios/CMakeLists.txt index 590d95fee7..a1254d772e 100644 --- a/src/quickcontrols2/ios/CMakeLists.txt +++ b/src/quickcontrols2/ios/CMakeLists.txt @@ -6,6 +6,7 @@ set(qml_files "Slider.qml" "RangeSlider.qml" "Switch.qml" + "Button.qml" ) set_source_files_properties(Slider.qml PROPERTIES QT_QML_SOURCE_VERSIONS "2.2;6.0" -- cgit v1.2.3