From 099e0294179126db5c98cc3dac309f2463360f3c Mon Sep 17 00:00:00 2001 From: J-P Nurmi <jpnurmi@digia.com> Date: Thu, 30 May 2013 16:31:31 +0200 Subject: [PATCH] TabViewStyle: expose styleData.availableWidth Change-Id: Ib209ec7311c64f172718c8baa7d7f63f6f79a3a8 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> --- src/private/TabBar.qml | 2 +- src/styles/Base/TabViewStyle.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/private/TabBar.qml b/src/private/TabBar.qml index 7f4db7791..6bcf795cc 100644 --- a/src/private/TabBar.qml +++ b/src/private/TabBar.qml @@ -192,7 +192,6 @@ FocusScope { property Item control: tabView property int index: tabindex - property real availableWidth: tabbar.availableWidth property QtObject styleData: QtObject { readonly property alias index: tabitem.tabindex @@ -202,6 +201,7 @@ FocusScope { readonly property alias previsousSelected: tabitem.previousSelected readonly property alias hovered: tabitem.containsMouse readonly property bool activeFocus: tabbar.activeFocus + readonly property real availableWidth: tabbar.availableWidth } sourceComponent: loader.item ? loader.item.tab : null diff --git a/src/styles/Base/TabViewStyle.qml b/src/styles/Base/TabViewStyle.qml index a668f43b0..04e34d4c9 100644 --- a/src/styles/Base/TabViewStyle.qml +++ b/src/styles/Base/TabViewStyle.qml @@ -136,7 +136,7 @@ Style { scale: control.tabPosition === Qt.TopEdge ? 1 : -1 property int totalOverlap: tabOverlap * (control.count - 1) - property real maxTabWidth: (availableWidth + totalOverlap) / control.count + property real maxTabWidth: (styleData.availableWidth + totalOverlap) / control.count implicitWidth: Math.round(Math.min(maxTabWidth, textitem.implicitWidth + 20)) implicitHeight: Math.round(textitem.implicitHeight + 10) -- GitLab