aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Verria <doris.verria@qt.io>2022-06-07 13:03:37 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-15 19:53:25 +0000
commitccea79f987f82d79cfbca0cbf371a64af24f0ea4 (patch)
treef49882b388674f84618deeeb6640395c29db8a6e
parent5b52775f4aaa0903b45d17ea8a2178410fa2f118 (diff)
iOS Style: Add Frame control
Change-Id: I1b916a1c0b6dc4bbeafe1991cbdc0b99367b2407 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 98480521814fca578c3481a11906c9dfc0fd781e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/quickcontrols2/ios/CMakeLists.txt1
-rw-r--r--src/quickcontrols2/ios/Frame.qml25
2 files changed, 26 insertions, 0 deletions
diff --git a/src/quickcontrols2/ios/CMakeLists.txt b/src/quickcontrols2/ios/CMakeLists.txt
index 0cda19bbb9..cbff8861ed 100644
--- a/src/quickcontrols2/ios/CMakeLists.txt
+++ b/src/quickcontrols2/ios/CMakeLists.txt
@@ -27,6 +27,7 @@ set(qml_files
"TabButton.qml"
"ToolButton.qml"
"MenuBarItem.qml"
+ "Frame.qml"
)
set_source_files_properties(Slider.qml PROPERTIES
QT_QML_SOURCE_VERSIONS "2.2;6.0"
diff --git a/src/quickcontrols2/ios/Frame.qml b/src/quickcontrols2/ios/Frame.qml
new file mode 100644
index 0000000000..06151404aa
--- /dev/null
+++ b/src/quickcontrols2/ios/Frame.qml
@@ -0,0 +1,25 @@
+// 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.iOS
+
+T.Frame {
+ id: control
+
+ implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+ contentWidth + leftPadding + rightPadding)
+ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+ contentHeight + topPadding + bottomPadding)
+
+ padding: 16
+ leftPadding: 20
+ rightPadding: 20
+ spacing: 10
+
+ background: Rectangle {
+ radius: 9
+ color: control.IOS.theme === IOS.Dark ? control.palette.light : control.palette.base
+ }
+}