aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/TabBar.qml
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/TabBar.qml')
-rw-r--r--src/imports/controls/TabBar.qml18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml
index f43975f2..22b5329e 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -1,9 +1,9 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
-** This file is part of the Qt Labs Controls module of the Qt Toolkit.
+** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage
@@ -34,8 +34,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick 2.7
+import QtQuick.Templates 2.0 as T
T.TabBar {
id: control
@@ -47,7 +47,6 @@ T.TabBar {
spacing: 1
- //! [contentItem]
contentItem: ListView {
implicitWidth: contentWidth
implicitHeight: 40
@@ -58,11 +57,14 @@ T.TabBar {
spacing: control.spacing
orientation: ListView.Horizontal
boundsBehavior: Flickable.StopAtBounds
+ flickableDirection: Flickable.AutoFlickIfNeeded
snapMode: ListView.SnapToItem
+
+ highlightMoveDuration: 0
+ highlightRangeMode: ListView.ApplyRange
+ preferredHighlightBegin: 40
+ preferredHighlightEnd: width - 40
}
- //! [contentItem]
- //! [background]
background: Rectangle { }
- //! [background]
}