aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/Frame.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-06-12 11:44:47 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-06-13 11:58:47 +0000
commit3e40325d44c64f2c3fa3403e9efd6a51759ec0e9 (patch)
treeec9b9fd12cc7e73d1faea2330d80e64770335abf /src/imports/controls/material/Frame.qml
parent556bfd141b02e8ce2a863112f90609409460797f (diff)
Material: fix elevation effect for Frame, GroupBox, Pane & TabBar
[ChangeLog][Material] Fixed (optional) elevation effects for Frame, GroupBox, Pane, and TabBar. Change-Id: Ic725049d7023175a6c00765fb85b944bc250c4c6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/Frame.qml')
-rw-r--r--src/imports/controls/material/Frame.qml8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml
index 5fba3210..c7a2935a 100644
--- a/src/imports/controls/material/Frame.qml
+++ b/src/imports/controls/material/Frame.qml
@@ -37,6 +37,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.Frame {
id: control
@@ -53,7 +54,12 @@ T.Frame {
background: Rectangle {
radius: 3
- color: "transparent"
+ color: control.Material.elevation > 0 ? control.Material.backgroundColor : "transparent"
border.color: control.Material.frameColor
+
+ layer.enabled: control.enabled && control.Material.elevation > 0
+ layer.effect: ElevationEffect {
+ elevation: control.Material.elevation
+ }
}
}