diff options
author | Bill King <bill.king@nokia.com> | 2009-12-09 23:07:52 (GMT) |
---|---|---|
committer | Bill King <bill.king@nokia.com> | 2009-12-09 23:07:52 (GMT) |
commit | e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4 (patch) | |
tree | 36884ee5c9a9287663c05d5db529a3a0f16b9550 /util/s60pixelmetrics/pixel_metrics.cpp | |
parent | 127d52df97b68fcf54a50e471a0b899d92fda10a (diff) | |
parent | 346d3618bad19714b41ad45715cdef9488ce8969 (diff) | |
download | Qt-e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4.zip Qt-e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4.tar.gz Qt-e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'util/s60pixelmetrics/pixel_metrics.cpp')
-rw-r--r-- | util/s60pixelmetrics/pixel_metrics.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/util/s60pixelmetrics/pixel_metrics.cpp b/util/s60pixelmetrics/pixel_metrics.cpp index 9507c67..9ba6c8b 100644 --- a/util/s60pixelmetrics/pixel_metrics.cpp +++ b/util/s60pixelmetrics/pixel_metrics.cpp @@ -812,13 +812,12 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric) value = PixelMetricMenuValue(metric, mainPaneRect); break; case QStyle::PM_ButtonIconSize: + { //lets use voice recorder icons as a base //Unfortunately S60 graphics don't separate button bevel graphics from the actual icon. //Se we have no means to query the margin from bevel border to "central icon" border. //So, we need to make a estimate... - const TInt varietyForButtons = !landscape ? 0 : 1; - TAknLayoutRect vRMainRect; vRMainRect.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::main_vorec_pane() ); @@ -833,7 +832,7 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric) // 0.32 is the estimate how much the icon occupies of the button bevel area value = vRButtonCellGraphicsRect.Rect().Width() * 0.32; - + } break; case QStyle::PM_SmallIconSize: { |