summaryrefslogtreecommitdiff
path: root/src/controls/ScrollView.qml
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2013-02-23 12:24:52 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-01 16:36:02 +0100
commitef9eba82884c73816562f23aa89fd007310eb259 (patch)
treec432487be87c667cccc7371594b460e1e0491c62 /src/controls/ScrollView.qml
parentcaafedc9ef8acbe414271ab30d745a34e8e43984 (diff)
downloadqtquickcontrols-ef9eba82884c73816562f23aa89fd007310eb259.tar.gz
Update TabView API and allow inser/remove of tabs
Change-Id: I6b10f539b036811243676f34c0fabe403c263923 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/ScrollView.qml')
-rw-r--r--src/controls/ScrollView.qml8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index a8f2621a..9c69bc18 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -91,7 +91,7 @@ FocusScope {
The default value is \c false
*/
- property bool frame: false
+ property bool frameVisible: false
/*!
This property controls if there should be a highlight
@@ -252,8 +252,8 @@ FocusScope {
ScrollViewHelper {
id: scroller
anchors.fill: parent
- property int frameWidth: frame ? styleitem.pixelMetric("defaultframewidth") : 0
- property bool outerFrame: !frame || !styleitem.styleHint("frameOnlyAroundContents")
+ property int frameWidth: frameVisible ? styleitem.pixelMetric("defaultframewidth") : 0
+ property bool outerFrame: !frameVisible || !styleitem.styleHint("frameOnlyAroundContents")
property int scrollBarSpacing: outerFrame ? 0 : styleitem.pixelMetric("scrollbarspacing")
property int verticalScrollbarOffset: verticalScrollBar.visible && !verticalScrollBar.isTransient ?
verticalScrollBar.width + scrollBarSpacing : 0
@@ -264,7 +264,7 @@ FocusScope {
id: styleitem
elementType: "frame"
sunken: true
- visible: frame
+ visible: frameVisible
anchors.fill: parent
anchors.rightMargin: scroller.outerFrame ? 0 : scroller.verticalScrollbarOffset
anchors.bottomMargin: scroller.outerFrame ? 0 : scroller.horizontalScrollbarOffset