From 454f4b9fc0d09abe9e724045ea59d8e2eafec0c5 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Thu, 23 May 2013 10:01:45 +0200
Subject: [PATCH] Fix rendering of bottom tab position with desktop style
We changed the TabView api from int to string so now we need
to translate to the style.
Change-Id: I9dafd9166a552a38eec06f46f4c6d4697b10eff6
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
---
src/private/qquickstyleitem.cpp | 4 ++--
src/styles/Desktop/TabViewStyle.qml | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/private/qquickstyleitem.cpp b/src/private/qquickstyleitem.cpp
index 036f1f043..8ed83dee8 100644
--- a/src/private/qquickstyleitem.cpp
+++ b/src/private/qquickstyleitem.cpp
@@ -322,11 +322,11 @@ void QQuickStyleItem::initStyleOption()
opt->features |= QStyleOptionTab::HasFrame;
if (hints().length() > 2) {
- QString shape = hints()[0];
+ QString orientation = hints()[0];
QString position = hints()[1];
QString selectedPosition = hints()[2];
- opt->shape = (shape == "Bottom") ? QTabBar::RoundedSouth : QTabBar::RoundedNorth;
+ opt->shape = (orientation == "Bottom") ? QTabBar::RoundedSouth : QTabBar::RoundedNorth;
if (position == QLatin1String("beginning"))
opt->position = QStyleOptionTab::Beginning;
diff --git a/src/styles/Desktop/TabViewStyle.qml b/src/styles/Desktop/TabViewStyle.qml
index bd3adb94f..bc71e4949 100644
--- a/src/styles/Desktop/TabViewStyle.qml
+++ b/src/styles/Desktop/TabViewStyle.qml
@@ -72,6 +72,7 @@ Style {
id: item
property string tabpos: control.count === 1 ? "only" : index === 0 ? "beginning" : index === control.count - 1 ? "end" : "middle"
property string selectedpos: tab.nextSelected ? "next" : tab.previousSelected ? "previous" : ""
+ property string orientation: control.tabPosition === Qt.TopEdge ? "Top" : "Bottom"
property int tabHSpace: __barstyle.pixelMetric("tabhspace");
property int tabVSpace: __barstyle.pixelMetric("tabvspace");
implicitWidth: Math.max(50, styleitem.textWidth(tab.title)) + tabHSpace + 2
@@ -89,7 +90,7 @@ Style {
anchors.bottomMargin: -1
anchors.leftMargin: -paintMargins + (style === "mac" && selected ? -1 : 0)
properties: { "hasFrame" : true }
- hints: [tabPosition, tabpos, selectedpos]
+ hints: [orientation, tabpos, selectedpos]
selected: tab.selected
text: elidedText(tab.title, tabbarItem.elide, item.width - item.tabHSpace)
--
GitLab