From cc18936d1759e58633417d030f5812e88f0888bf Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Thu, 24 Oct 2013 14:16:31 +0200
Subject: [PATCH] QmlDesigner: adjustment of Section(View)
Adjusting the item library and property editor,
so they follow the same style for sections.
Change-Id: I79d3560acff3b126056cf55b81fd21a531f9594c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../HelperWidgets/Section.qml | 11 ++++++-
.../itemlibrary/qml/SectionView.qml | 32 +++++++++++++++----
2 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Section.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Section.qml
index c59fe14ad98..9380e844ce2 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Section.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Section.qml
@@ -52,6 +52,9 @@ Item {
anchors.verticalCenter: parent.verticalCenter
color: "white"
x: 22
+ style: Text.Sunken
+ styleColor: "#292929"
+ font.bold: true
}
Image {
@@ -103,9 +106,10 @@ Item {
x: 8
y: header.height + 4
id: row
+ Behavior on opacity { NumberAnimation{easing.type: Easing.Linear ; duration: 80} }
}
- Behavior on height { NumberAnimation{easing.type: Easing.OutCubic ; duration: 60} }
+ Behavior on height { NumberAnimation{easing.type: Easing.OutCubic ; duration: 140} }
states: [
State {
@@ -114,6 +118,11 @@ Item {
target: section
height: header.height
}
+ PropertyChanges {
+ target: row
+ opacity: 0
+
+ }
}
]
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
index 5a43d7de750..bfc324ebe46 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
+++ b/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
@@ -28,6 +28,7 @@
****************************************************************************/
import QtQuick 2.1
+import QtQuick.Controls 1.0 as Controls
// view displaying one item library section including its grid
@@ -114,12 +115,27 @@ Column {
width: parent.width
height: style.sectionTitleHeight
- color: style.sectionTitleBackgroundColor
+ gradient: Gradient {
+ GradientStop {color: '#555' ; position: 0}
+ GradientStop {color: '#444' ; position: 1}
+ }
+
+ Rectangle {
+ color:"#333"
+ width: parent.width
+ height: 1
+ }
+
+ Rectangle {
+ color: "#333"
+ anchors.bottom: parent.bottom
+ width: parent.width
+ height: 1
+ }
Item {
id: arrow
- Rectangle { y: 0; x: 0; height: 1; width: 11; color: style.sectionArrowColor }
Rectangle { y: 1; x: 1; height: 1; width: 9; color: style.sectionArrowColor }
Rectangle { y: 2; x: 2; height: 1; width: 7; color: style.sectionArrowColor }
Rectangle { y: 3; x: 3; height: 1; width: 5; color: style.sectionArrowColor }
@@ -127,25 +143,26 @@ Column {
Rectangle { y: 5; x: 5; height: 1; width: 1; color: style.sectionArrowColor }
anchors.left: parent.left
- anchors.leftMargin: 10
+ anchors.leftMargin: 4
anchors.verticalCenter: parent.verticalCenter
width: 11
height: 6
transformOrigin: Item.Center
}
- Text {
+ Controls.Label {
id: text
anchors.verticalCenter: parent.verticalCenter
anchors.left: arrow.right
- anchors.leftMargin: 12
+ anchors.leftMargin: 4
text: sectionName // to be set by model
color: style.sectionTitleTextColor
elide: Text.ElideMiddle
font.bold: true
- renderType: Text.NativeRendering
+ style: Text.Sunken
+ styleColor: "#292929"
}
MouseArea {
id: mouseArea
@@ -161,6 +178,9 @@ Column {
Item {
id: gridFrame
+ Behavior on opacity { NumberAnimation{easing.type: Easing.Linear ; duration: 80} }
+ Behavior on height { NumberAnimation{easing.type: Easing.OutCubic ; duration: 140} }
+
function toggleExpanded() {
state = ((state == "")? "shrunk":"")
--
GitLab