summaryrefslogtreecommitdiff
path: root/src/private
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-03-21 20:06:03 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-22 13:38:46 +0100
commit3079176a87a77095ddbc320c6c07e1fad46596dd (patch)
treec08a17d2c4b0d53192527b385365f371abaea1a8 /src/private
parent4d97d564d68a69df8059a98bd068a2a5a13b3dd5 (diff)
downloadqtquickcontrols-3079176a87a77095ddbc320c6c07e1fad46596dd.tar.gz
TabBar: Tweaky, tweaky little style...
Tweaky, tweaky, shine on Mac! Change-Id: Ic338b1474f1cbaeedda11be00a2bfbdbf7388adb Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/private')
-rw-r--r--src/private/qstyleitem.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/private/qstyleitem.cpp b/src/private/qstyleitem.cpp
index 831e8e96..8a21e50f 100644
--- a/src/private/qstyleitem.cpp
+++ b/src/private/qstyleitem.cpp
@@ -303,7 +303,7 @@ void QStyleItem::initStyleOption()
opt->selectedPosition = QStyleOptionTab::NextIsSelected;
else if (selectedPosition == QLatin1String("previous"))
opt->selectedPosition = QStyleOptionTab::PreviousIsSelected;
- else
+ else
opt->selectedPosition = QStyleOptionTab::NotAdjacent;
}
@@ -1100,7 +1100,14 @@ void QStyleItem::paint(QPainter *painter)
qApp->style()->drawComplexControl(QStyle::CC_ToolButton, qstyleoption_cast<QStyleOptionComplex*>(m_styleoption), painter);
break;
case Tab:
- qApp->style()->drawControl(QStyle::CE_TabBarTab, m_styleoption, painter);
+ if (style() == "mac") {
+ m_styleoption->rect.translate(0, 1); // Unhack QMacStyle's hack
+ qApp->style()->drawControl(QStyle::CE_TabBarTabShape, m_styleoption, painter);
+ m_styleoption->rect.translate(0, -1);
+ qApp->style()->drawControl(QStyle::CE_TabBarTabLabel, m_styleoption, painter);
+ } else {
+ qApp->style()->drawControl(QStyle::CE_TabBarTab, m_styleoption, painter);
+ }
break;
case Frame:
qApp->style()->drawControl(QStyle::CE_ShapedFrame, m_styleoption, painter);