aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/nativestyle/controls
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-05-26 10:34:03 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-05-27 11:29:45 +0000
commitf19aedebe56b4e935d73b793c863cd473ab9bbeb (patch)
treeb742b26fbfbd8cea2fad48d9d50e3b7fd21cc890 /src/imports/nativestyle/controls
parent0316a41ba0f42174abc707c6794a9d991155ddbc (diff)
Native style: add Frame
Change-Id: Ide8f2910c54a378c8c9d03554718de54feb9cf20 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/nativestyle/controls')
-rw-r--r--src/imports/nativestyle/controls/DefaultFrame.qml68
-rw-r--r--src/imports/nativestyle/controls/controls.pri1
2 files changed, 69 insertions, 0 deletions
diff --git a/src/imports/nativestyle/controls/DefaultFrame.qml b/src/imports/nativestyle/controls/DefaultFrame.qml
new file mode 100644
index 00000000..db80886e
--- /dev/null
+++ b/src/imports/nativestyle/controls/DefaultFrame.qml
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
+import QtQuick.NativeStyle 6.0 as NativeStyle
+
+T.Frame {
+ id: control
+
+ property bool nativeBackground: background instanceof NativeStyle.StyleItem
+
+ implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+ contentWidth + leftPadding + rightPadding)
+ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+ contentHeight + topPadding + bottomPadding)
+
+ leftPadding: nativeBackground ? background.contentPadding.left + leftInset : 12
+ rightPadding: nativeBackground ? background.contentPadding.right + rightInset : 12
+ topPadding: nativeBackground ? background.contentPadding.top + topInset : 12
+ bottomPadding: nativeBackground ? background.contentPadding.bottom + bottomInset : 12
+
+ topInset: nativeBackground ? background.insets.top : 0
+ bottomInset: nativeBackground ? background.insets.bottom : 0
+ leftInset: nativeBackground ? background.insets.left : 0
+ rightInset: nativeBackground ? background.insets.right : 0
+
+ background: NativeStyle.Frame {
+ control: control
+ contentWidth: control.contentWidth
+ contentHeight: control.contentHeight
+ }
+}
diff --git a/src/imports/nativestyle/controls/controls.pri b/src/imports/nativestyle/controls/controls.pri
index 16031f3d..eeddfa03 100644
--- a/src/imports/nativestyle/controls/controls.pri
+++ b/src/imports/nativestyle/controls/controls.pri
@@ -6,3 +6,4 @@ QML_FILES += \
$$PWD/DefaultRadioButton.qml \
$$PWD/DefaultSpinBox.qml \
$$PWD/DefaultTextField.qml \
+ $$PWD/DefaultFrame.qml \