diff options
author | Doris Verria <doris.verria@qt.io> | 2022-07-19 00:45:09 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-30 05:07:54 +0000 |
commit | 0ebb9c1465294831de4b78339d8bfa1e2af1bbf8 (patch) | |
tree | d207607a294bd160812ea4297b6322dc811baf5a /src | |
parent | dfd6170ebb9ce1b1106d8de953029a04279c616c (diff) |
iOS Style: Add Menu controls
Add Menu, MenuItem, and MenuSeparator.
Change-Id: Ic5d6629418081e591c1abd28cea73b6c3b3ecd1c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit b1c90719fe991c5dd1f7e290c52eeeebe447278c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
46 files changed, 204 insertions, 0 deletions
diff --git a/src/quickcontrols2/ios/CMakeLists.txt b/src/quickcontrols2/ios/CMakeLists.txt index 8168d0d89b..b793c9089f 100644 --- a/src/quickcontrols2/ios/CMakeLists.txt +++ b/src/quickcontrols2/ios/CMakeLists.txt @@ -35,6 +35,9 @@ set(qml_files "MenuBar.qml" "Drawer.qml" "Popup.qml" + "Menu.qml" + "MenuItem.qml" + "MenuSeparator.qml" ) set_source_files_properties(Slider.qml PROPERTIES diff --git a/src/quickcontrols2/ios/Menu.qml b/src/quickcontrols2/ios/Menu.qml new file mode 100644 index 0000000000..db142868a9 --- /dev/null +++ b/src/quickcontrols2/ios/Menu.qml @@ -0,0 +1,71 @@ +// Copyright (C) 2022 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 + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl +import QtQuick.Controls.iOS + +T.Menu { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + contentHeight + topPadding + bottomPadding) + + delegate: MenuItem {} + + margins: 0 + cascade: true + dim: modal || control.parent && control.parent.menu + overlap: control.width + + enter: Transition { + NumberAnimation { property: "scale"; from: 0.2; to: 1.0; easing.type: Easing.OutQuint; duration: 220 } + NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; easing.type: Easing.OutCubic; duration: 150 } + } + + exit: Transition { + NumberAnimation { property: "scale"; from: 1.0; to: 0.0; easing.type: Easing.OutQuint; duration: 220 } + NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; easing.type: Easing.OutCubic; duration: 150 } + } + + contentItem: ListView { + implicitHeight: contentHeight + model: control.contentModel + interactive: Window.window + ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height + : false + clip: true + currentIndex: control.currentIndex + + T.ScrollIndicator.vertical: ScrollIndicator { } + } + + background: Item { + implicitHeight: 44 + implicitWidth: 250 + NinePatchImage { + width: parent.width + height: parent.height + source: control.IOS.url + "menu-background" + NinePatchImageSelector on source { + states: [ + {"light": control.IOS.theme === IOS.Light}, + {"dark": control.IOS.theme === IOS.Dark} + ] + } + } + } + + T.Overlay.modal: Rectangle { + color: Color.transparent("black", 0.5) + Behavior on opacity { NumberAnimation { duration: 150 } } + } + + T.Overlay.modeless: Rectangle { + color: Color.transparent("black", 0.5) + Behavior on opacity { NumberAnimation { duration: 150 } } + } +} diff --git a/src/quickcontrols2/ios/MenuItem.qml b/src/quickcontrols2/ios/MenuItem.qml new file mode 100644 index 0000000000..8b05c33d45 --- /dev/null +++ b/src/quickcontrols2/ios/MenuItem.qml @@ -0,0 +1,104 @@ +// Copyright (C) 2022 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 + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl +import QtQuick.Controls.iOS + +T.MenuItem { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding, + implicitIndicatorHeight + topPadding + bottomPadding) + + leftPadding: 12 + rightPadding: 18 + spacing: 9 + + icon.width: 19 + icon.height: 19 + icon.color: control.palette.windowText + + property bool isSingleItem: control.menu && control.menu.count === 1 + property bool isFirstItem: !isSingleItem && control.menu && control.menu.itemAt(0) === control ? true : false + property bool isLastItem: !isSingleItem && control.menu && control.menu.itemAt(control.menu.count - 1) === control ? true : false + property real indicatorWidth: 12 + + contentItem: IconLabel { + readonly property real padding: control.indicatorWidth + control.spacing + leftPadding: !control.mirrored ? padding : 0 + rightPadding: control.mirrored ? padding : 0 + + spacing: control.spacing + mirrored: control.mirrored + display: control.display + alignment: Qt.AlignLeft + + icon: control.icon + text: control.text + font: control.font + color: control.palette.windowText + } + + arrow: ColorImage { + x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: 7 + height: 12 + rotation: control.subMenu && (control.down || control.subMenu.visible) ? 90 : 0 + + visible: control.subMenu + opacity: control.enabled ? 1 : 0.5 + mirror: control.mirrored + color: control.palette.windowText + source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls/iOS/images/arrow-indicator-light.png" : "" + + Behavior on rotation { RotationAnimation { duration: 100 } } + } + + indicator: ColorImage { + x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.indicatorWidth + height: control.indicatorWidth + + visible: control.checked + source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls/iOS/images/radiodelegate-indicator-light.png" : "" + color: control.palette.windowText + } + + background: Item { + implicitHeight: 44 + implicitWidth: 250 + NinePatchImage { + y: control.isLastItem ? -1 : 0 + width: parent.width + height: control.isLastItem ? parent.height + 1 : parent.height + rotation: control.isLastItem ? 180 : 0 + visible: !(isSingleItem && !control.down) + source: control.IOS.url + "menuitem-background" + NinePatchImageSelector on source { + states: [ + {"edge": control.isFirstItem || control.isLastItem}, + {"single": control.isSingleItem}, + {"light": control.IOS.theme === IOS.Light}, + {"dark": control.IOS.theme === IOS.Dark}, + {"pressed": control.down} + ] + } + } + } + + states: [ + State { + name: "submenu-opened" + when: control.subMenu && control.subMenu.visible + PropertyChanges { target: control.menu; scale: 0.9 } + } + ] +} + diff --git a/src/quickcontrols2/ios/MenuSeparator.qml b/src/quickcontrols2/ios/MenuSeparator.qml new file mode 100644 index 0000000000..5d64365219 --- /dev/null +++ b/src/quickcontrols2/ios/MenuSeparator.qml @@ -0,0 +1,26 @@ +// Copyright (C) 2022 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 + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl +import QtQuick.Controls.iOS + +T.MenuSeparator { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding) + + contentItem: NinePatchImage { + source: control.IOS.url + "menuseparator-separator" + NinePatchImageSelector on source { + states: [ + {"light": control.IOS.theme === IOS.Light}, + {"dark": control.IOS.theme === IOS.Dark} + ] + } + } +} diff --git a/src/quickcontrols2/ios/images/menu-background-dark.9.png b/src/quickcontrols2/ios/images/menu-background-dark.9.png Binary files differnew file mode 100644 index 0000000000..863a3c1759 --- /dev/null +++ b/src/quickcontrols2/ios/images/menu-background-dark.9.png diff --git a/src/quickcontrols2/ios/images/menu-background-dark@2x.9.png b/src/quickcontrols2/ios/images/menu-background-dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..ddddaa3532 --- /dev/null +++ b/src/quickcontrols2/ios/images/menu-background-dark@2x.9.png diff --git a/src/quickcontrols2/ios/images/menu-background-dark@3x.9.png b/src/quickcontrols2/ios/images/menu-background-dark@3x.9.png Binary files differnew file mode 100644 index 0000000000..a640f6fe06 --- /dev/null +++ b/src/quickcontrols2/ios/images/menu-background-dark@3x.9.png diff --git a/src/quickcontrols2/ios/images/menu-background-light.9.png b/src/quickcontrols2/ios/images/menu-background-light.9.png Binary files differnew file mode 100644 index 0000000000..410abed278 --- /dev/null +++ b/src/quickcontrols2/ios/images/menu-background-light.9.png diff --git a/src/quickcontrols2/ios/images/menu-background-light@2x.9.png b/src/quickcontrols2/ios/images/menu-background-light@2x.9.png Binary files differnew file mode 100644 index 0000000000..82d99af518 --- /dev/null +++ b/src/quickcontrols2/ios/images/menu-background-light@2x.9.png diff --git a/src/quickcontrols2/ios/images/menu-background-light@3x.9.png b/src/quickcontrols2/ios/images/menu-background-light@3x.9.png Binary files differnew file mode 100644 index 0000000000..48f3f7ed4e --- /dev/null +++ b/src/quickcontrols2/ios/images/menu-background-light@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-dark.9.png b/src/quickcontrols2/ios/images/menuitem-background-dark.9.png Binary files differnew file mode 100644 index 0000000000..463def221b --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-dark.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-dark@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..53fdaa7c35 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-dark@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-dark@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-dark@3x.9.png Binary files differnew file mode 100644 index 0000000000..a514f80071 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-dark@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-dark.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-dark.9.png Binary files differnew file mode 100644 index 0000000000..514c0901e6 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-dark.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-dark@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..1ca1ee8d9e --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-dark@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-dark@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-dark@3x.9.png Binary files differnew file mode 100644 index 0000000000..6a4277a7c3 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-dark@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-light.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-light.9.png Binary files differnew file mode 100644 index 0000000000..262c12d7b7 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-light.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-light@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-light@2x.9.png Binary files differnew file mode 100644 index 0000000000..4838abb511 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-light@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-light@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-light@3x.9.png Binary files differnew file mode 100644 index 0000000000..0e17b608da --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-light@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark.9.png Binary files differnew file mode 100644 index 0000000000..290101b99b --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..a738f20650 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@3x.9.png Binary files differnew file mode 100644 index 0000000000..ef05342d0b --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light.9.png Binary files differnew file mode 100644 index 0000000000..706f642552 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@2x.9.png Binary files differnew file mode 100644 index 0000000000..e196a71bbe --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@3x.9.png Binary files differnew file mode 100644 index 0000000000..4f5a71ff86 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-light.9.png b/src/quickcontrols2/ios/images/menuitem-background-light.9.png Binary files differnew file mode 100644 index 0000000000..644f207a26 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-light.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-light@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-light@2x.9.png Binary files differnew file mode 100644 index 0000000000..d7c78cb5dc --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-light@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-light@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-light@3x.9.png Binary files differnew file mode 100644 index 0000000000..70ce76a961 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-light@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-dark.9.png b/src/quickcontrols2/ios/images/menuitem-background-pressed-dark.9.png Binary files differnew file mode 100644 index 0000000000..4f1fdfc82c --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-pressed-dark.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..f72729f45d --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@3x.9.png Binary files differnew file mode 100644 index 0000000000..eaa574174b --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-light.9.png b/src/quickcontrols2/ios/images/menuitem-background-pressed-light.9.png Binary files differnew file mode 100644 index 0000000000..5141095a95 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-pressed-light.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-light@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-pressed-light@2x.9.png Binary files differnew file mode 100644 index 0000000000..b8fb91997f --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-pressed-light@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-light@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-pressed-light@3x.9.png Binary files differnew file mode 100644 index 0000000000..250247d322 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-pressed-light@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark.9.png b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark.9.png Binary files differnew file mode 100644 index 0000000000..708285fe39 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..0cb6f175ff --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@3x.9.png Binary files differnew file mode 100644 index 0000000000..cb7c1f210c --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light.9.png b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light.9.png Binary files differnew file mode 100644 index 0000000000..5a71309c91 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@2x.9.png b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@2x.9.png Binary files differnew file mode 100644 index 0000000000..7798409aa3 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@3x.9.png b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@3x.9.png Binary files differnew file mode 100644 index 0000000000..77a69bd247 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-dark.9.png b/src/quickcontrols2/ios/images/menuseparator-separator-dark.9.png Binary files differnew file mode 100644 index 0000000000..819e465354 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuseparator-separator-dark.9.png diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-dark@2x.9.png b/src/quickcontrols2/ios/images/menuseparator-separator-dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..81e3cdd391 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuseparator-separator-dark@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-dark@3x.9.png b/src/quickcontrols2/ios/images/menuseparator-separator-dark@3x.9.png Binary files differnew file mode 100644 index 0000000000..95d88ee659 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuseparator-separator-dark@3x.9.png diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-light.9.png b/src/quickcontrols2/ios/images/menuseparator-separator-light.9.png Binary files differnew file mode 100644 index 0000000000..46276666e2 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuseparator-separator-light.9.png diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-light@2x.9.png b/src/quickcontrols2/ios/images/menuseparator-separator-light@2x.9.png Binary files differnew file mode 100644 index 0000000000..0e2b9986a9 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuseparator-separator-light@2x.9.png diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-light@3x.9.png b/src/quickcontrols2/ios/images/menuseparator-separator-light@3x.9.png Binary files differnew file mode 100644 index 0000000000..d3eb183bf3 --- /dev/null +++ b/src/quickcontrols2/ios/images/menuseparator-separator-light@3x.9.png |