diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-06 01:20:51 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-06 01:20:51 (GMT) |
commit | 441e0e6a29ac02c35f6269d7c83a6d70465b7405 (patch) | |
tree | 489bf8eb42e7b1bd2ec467c453e2effce17ffa97 /src | |
parent | b7513f4a15ecac1adf54f2abdda6b56c89d6bef4 (diff) | |
parent | 9e44dfba207532215b82c306f9ad4f52b7ef07f4 (diff) | |
download | Qt-441e0e6a29ac02c35f6269d7c83a6d70465b7405.zip Qt-441e0e6a29ac02c35f6269d7c83a6d70465b7405.tar.gz Qt-441e0e6a29ac02c35f6269d7c83a6d70465b7405.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')
-rw-r--r-- | src/gui/styles/qs60style.cpp | 8 |
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; } |