From eca7744e0a6afc492a0f387ab5456173b39d017a Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@nokia.com>
Date: Fri, 8 Jan 2010 17:09:11 +0100
Subject: [PATCH] QmlDesigner.StatesEditor: Fixing the scrollbar
---
.../components/stateseditor/stateslist.qml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
index daa61f883c0..9d5464cbaa5 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
+++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
@@ -178,14 +178,12 @@ Rectangle {
height:2
color:"black"
anchors.centerIn:parent
- //effect: Blur { blurRadius: 1; }
}
Rectangle {
width:2
height:12
color:"black"
anchors.centerIn:parent
- //effect: Blur { blurRadius: 1; }
}
MouseRegion {
@@ -248,7 +246,6 @@ Rectangle {
height:2
color:"black"
anchors.centerIn:parent
- //effect: Blur { blurRadius: 1; }
}
visible: { root.currentStateIndex != 0 }
@@ -299,10 +296,12 @@ Rectangle {
// the bar itself
Item {
id: draggableBar
- width: if (horizontalScrollbar.viewLength>horizontalScrollbar.totalLength) parent.width;
- else horizontalScrollbar.viewLength/horizontalScrollbar.totalLength * parent.width;
+ width: if (horizontalScrollbar.totalLength>0) {
+ if (horizontalScrollbar.viewLength>horizontalScrollbar.totalLength) parent.width;
+ else horizontalScrollbar.viewLength/horizontalScrollbar.totalLength * parent.width;
+ } else 0;
height: parent.height;
- x: horizontalScrollbar.viewPosition*horizontalScrollbar.width/horizontalScrollbar.totalLength;
+ x: (horizontalScrollbar.totalLength>0?horizontalScrollbar.viewPosition*horizontalScrollbar.width/horizontalScrollbar.totalLength:0);
Rectangle {
--
GitLab