aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/TabBar.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-08-27 11:59:57 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-08-27 11:59:57 +0000
commit67f67f2cc6de160ddea4aa76afc56e86415ed99b (patch)
tree215ffb3e3716db58360bcc1b09f36f49d5d2bf00 /src/imports/controls/material/TabBar.qml
parentb588ad9e45477a23d1ebd024a4b0a0ae49b7c7d5 (diff)
parentbbc9b308db0476d77a67e8c896883410d4660acf (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8v5.8.0-alpha1
Diffstat (limited to 'src/imports/controls/material/TabBar.qml')
-rw-r--r--src/imports/controls/material/TabBar.qml7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml
index 2b693809..5b2c8888 100644
--- a/src/imports/controls/material/TabBar.qml
+++ b/src/imports/controls/material/TabBar.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.7
import QtQuick.Templates 2.1 as T
import QtQuick.Controls.Material 2.1
import QtQuick.Controls.Material.impl 2.1
@@ -59,11 +59,16 @@ T.TabBar {
spacing: control.spacing
orientation: ListView.Horizontal
boundsBehavior: Flickable.StopAtBounds
+ flickableDirection: Flickable.AutoFlickIfNeeded
snapMode: ListView.SnapToItem
highlightMoveDuration: 250
highlightResizeDuration: 0
highlightFollowsCurrentItem: true
+ highlightRangeMode: ListView.ApplyRange
+ preferredHighlightBegin: 48
+ preferredHighlightEnd: width - 48
+
highlight: Item {
z: 2
Rectangle {