diff options
3 files changed, 33 insertions, 11 deletions
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml index 5821c00c5a..91ecb8641d 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml +++ b/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml @@ -112,20 +112,30 @@ Item { if (updateFlickable) flickable.contentY = Math.max(0, flickable.contentHeight * y / bar.height) } - - Rectangle { - width: parent.height - 1 - height: parent.width + + Rectangle { + width: parent.height - 1 + height: parent.width - 1 y: 1 - height - - rotation: 90 + + rotation: 90 transformOrigin: Item.BottomLeft + color: "black" + + + Rectangle { + width: parent.width - 2 + height: parent.height - 2 + y: 1 + x: 1 + gradient: Gradient { GradientStop { position: 0.0; color: style.scrollbarGradientStartColor } GradientStop { position: 1.0; color: style.scrollbarGradientEndColor } } } + } MouseArea { anchors.fill: parent diff --git a/src/plugins/qmldesigner/components/resources/scrollbar.css b/src/plugins/qmldesigner/components/resources/scrollbar.css index e4f8ac89c2..5c1199d718 100644 --- a/src/plugins/qmldesigner/components/resources/scrollbar.css +++ b/src/plugins/qmldesigner/components/resources/scrollbar.css @@ -2,15 +2,17 @@ border: 1px solid #8F8F8F; background: #707070; width: 10px; - margin: 2px 0 2px 0; + margin: 2px 0 0px 0; } QScrollBar::handle:vertical { - background: qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0 + background-color: qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0 stop: 0 #cEcEcE, stop: 1 #8E8E8E); - min-height: 20px; - border-radius: 10px; + min-height: 20px; + border: 2px solid #0F0F0F; + border-radius: 6px; + border-width: 1; } QScrollBar::add-line:vertical { diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml index 441ecab71a..7563ba5192 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml +++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml @@ -532,6 +532,8 @@ Rectangle { anchors.right : listView.right anchors.top : listView.bottom anchors.topMargin: 1 + anchors.leftMargin: 1 + anchors.rightMargin: 1 height: 10; @@ -547,9 +549,17 @@ Rectangle { Rectangle { - height:parent.height-1 + height:parent.height-1 width:parent.width y:1 + color: "black" + } + + Rectangle { + height:parent.height-3 + width:parent.width - 2 + y:2 + x:1 gradient: Gradient { GradientStop { position: 0.0; color: "#C6C6C6" } |