Commit c6389d78 authored by Jens Bache-Wiig's avatar Jens Bache-Wiig Committed by The Qt Project
Browse files

Move backgroundColor from TableView to TableViewStyle


This property was not respected by some of the native styles
and makes more sense as a styling attribute.

Change-Id: I9cc1d3a130b764a67552ed7f0cec49ccc87ea246
Reviewed-by: default avatarJ-P Nurmi <jpnurmi@digia.com>
parent 158fe2a0
6.2 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 dev old/5.1 old/5.2 wip/calendar wip/tizen v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1
No related merge requests found
Showing with 23 additions and 10 deletions
......@@ -161,12 +161,6 @@ ScrollView {
*/
property Component rowDelegate: __style ? __style.rowDelegate : null
/*! \qmlproperty color TableView::backgroundColor
This property sets the background color of the viewport.
The default value is the base color of the SystemPalette. */
property alias backgroundColor: colorRect.color
/*! This property defines a delegate to draw a header.
In the header delegate you have access to the following special properties:
......@@ -404,7 +398,7 @@ ScrollView {
id: colorRect
parent: viewport
anchors.fill: parent
color: palette.base
color: __style ? __style.backgroundColor : palette.base
z: -1
}
......
......@@ -59,7 +59,13 @@ ScrollViewStyle {
/*! The text color. */
property color textColor: __syspal.text
/*! The text highlight color, used behind selections. */
/*! The background color. */
property color backgroundColor: __syspal.base
/*! The alternate background color. */
property color alternateBackgroundColor: Qt.darker(__syspal.base, 1.06)
/*! The text highlight color, used within selections. */
property color highlightedTextColor: "white"
/*! Activates items on single click. */
......@@ -96,8 +102,16 @@ ScrollViewStyle {
height: 20
property color selectedColor: styleData.hasActiveFocus ? "#38d" : "#999"
gradient: Gradient {
GradientStop { color: styleData.selected ? Qt.lighter(selectedColor, 1.3) : styleData.alternate ? "#f2f2f2" : "white" ; position: 0 }
GradientStop { color: styleData.selected ? Qt.lighter(selectedColor, 1.0) : styleData.alternate ? "#f2f2f2" : "white" ; position: 1 }
GradientStop {
color: styleData.selected ? Qt.lighter(selectedColor, 1.3) :
styleData.alternate ? alternateBackgroundColor : backgroundColor
position: 0
}
GradientStop {
color: styleData.selected ? Qt.lighter(selectedColor, 1.0) :
styleData.alternate ? alternateBackgroundColor : backgroundColor
position: 1
}
}
Rectangle {
anchors.bottom: parent.bottom
......
......@@ -44,9 +44,14 @@ import QtQuick.Controls.Private 1.0
ScrollViewStyle {
id: root
property var __syspal: SystemPalette {
colorGroup: control.enabled ?
SystemPalette.Active : SystemPalette.Disabled
}
readonly property TableView control: __control
property bool activateItemOnSingleClick: __styleitem.styleHint("activateItemOnSingleClick")
property color textColor: __styleitem.textColor
property color backgroundColor: __syspal.base
property color highlightedTextColor: __styleitem.highlightedTextColor
property StyleItem __styleitem: StyleItem{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment