Commit 7db1fee0 authored by J-P Nurmi's avatar J-P Nurmi Committed by The Qt Project
Browse files

TabBar: do not force squeeze the tabs


Let the style decide whether tabs should be squeezed or not.

Change-Id: I25bdd9a4d045583613e14b4cba680642eda2ab59
Reviewed-by: default avatarJens Bache-Wiig <jens.bache-wiig@digia.com>
parent 3f9faed1
6.2 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 dev old/5.1 old/5.2 wip/calendar wip/tizen v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1
No related merge requests found
Showing with 9 additions and 3 deletions
...@@ -163,7 +163,7 @@ FocusScope { ...@@ -163,7 +163,7 @@ FocusScope {
property bool previousSelected: tabView.currentIndex === index - 1 property bool previousSelected: tabView.currentIndex === index - 1
z: selected ? 1 : -index z: selected ? 1 : -index
implicitWidth: Math.min(tabloader.implicitWidth, availableWidth/tabrow.count) + 1 implicitWidth: tabloader.implicitWidth
implicitHeight: tabloader.implicitHeight implicitHeight: tabloader.implicitHeight
onPressed: { onPressed: {
...@@ -180,6 +180,7 @@ FocusScope { ...@@ -180,6 +180,7 @@ FocusScope {
property Item control: tabView property Item control: tabView
property int index: tabindex property int index: tabindex
property real availableWidth: tabbar.availableWidth
property QtObject tab: QtObject { property QtObject tab: QtObject {
readonly property alias index: tabitem.tabindex readonly property alias index: tabitem.tabindex
......
...@@ -134,7 +134,10 @@ Style { ...@@ -134,7 +134,10 @@ Style {
property Component tab: Item { property Component tab: Item {
scale: control.tabPosition === Qt.TopEdge ? 1 : -1 scale: control.tabPosition === Qt.TopEdge ? 1 : -1
implicitWidth: Math.round(textitem.implicitWidth + 20) property int totalOverlap: tabOverlap * (control.count - 1)
property real maxTabWidth: (availableWidth + totalOverlap) / control.count
implicitWidth: Math.round(Math.min(maxTabWidth, textitem.implicitWidth + 20))
implicitHeight: Math.round(textitem.implicitHeight + 10) implicitHeight: Math.round(textitem.implicitHeight + 10)
clip: true clip: true
......
...@@ -73,7 +73,9 @@ Style { ...@@ -73,7 +73,9 @@ Style {
property string orientation: control.tabPosition === Qt.TopEdge ? "Top" : "Bottom" property string orientation: control.tabPosition === Qt.TopEdge ? "Top" : "Bottom"
property int tabHSpace: __barstyle.pixelMetric("tabhspace"); property int tabHSpace: __barstyle.pixelMetric("tabhspace");
property int tabVSpace: __barstyle.pixelMetric("tabvspace"); property int tabVSpace: __barstyle.pixelMetric("tabvspace");
implicitWidth: Math.max(50, styleitem.textWidth(tab.title)) + tabHSpace + 2 property int totalOverlap: tabOverlap * (control.count - 1)
property real maxTabWidth: (control.width + totalOverlap) / control.count
implicitWidth: Math.min(maxTabWidth, Math.max(50, styleitem.textWidth(tab.title)) + tabHSpace + 2)
implicitHeight: Math.max(styleitem.font.pixelSize + tabVSpace + 6, 0) implicitHeight: Math.max(styleitem.font.pixelSize + tabVSpace + 6, 0)
StyleItem { StyleItem {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment