summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-05 15:25:52 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-05 15:25:52 (GMT)
commit9e44dfba207532215b82c306f9ad4f52b7ef07f4 (patch)
tree19b1f511b24e8513b3049de5c68a0cbdf2ce059e /src/gui
parent20218cbb57a368c2d6981ca7001c6202ed885c24 (diff)
parent1b129f922dae09865d18422ca6be10d6e1587315 (diff)
downloadQt-9e44dfba207532215b82c306f9ad4f52b7ef07f4.zip
Qt-9e44dfba207532215b82c306f9ad4f52b7ef07f4.tar.gz
Qt-9e44dfba207532215b82c306f9ad4f52b7ef07f4.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QCalendarWidget draws only one-digit dates Add spectrum analyzer demo app
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/styles/qs60style.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 20297ae..f32bd5e 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -653,6 +653,8 @@ void QS60StylePrivate::setFont(QWidget *widget) const
fontCategory = QS60StyleEnums::FC_Primary;
} else if (qobject_cast<QMenu *>(widget)){
fontCategory = QS60StyleEnums::FC_Primary;
+ } else if (qobject_cast<QCalendarWidget *>(widget)){
+ fontCategory = QS60StyleEnums::FC_Secondary;
}
if (fontCategory != QS60StyleEnums::FC_Undefined) {
const bool resolveFontSize = widget->testAttribute(Qt::WA_SetFont)
@@ -2478,6 +2480,12 @@ int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const
//double the top layout margin for dialogs, it is very close to real value
//without having to define custom pixel metric
metricValue *= 2;
+
+ if (widget && (metric == PM_FocusFrameHMargin))
+ if (qobject_cast<const QTableView *>(widget))
+ //Halve the focus frame margin for table items
+ metricValue /= 2;
+
return metricValue;
}