239 CFsLayoutManager::LayoutMetricsRect( |
239 CFsLayoutManager::LayoutMetricsRect( |
240 currentSize, |
240 currentSize, |
241 mainIconMetrics, |
241 mainIconMetrics, |
242 rect, |
242 rect, |
243 mainIconVariety ); |
243 mainIconVariety ); |
|
244 // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK |
|
245 if (rect.iTl.iY < 15) |
|
246 { |
|
247 rect.Move(0, 15 - rect.iTl.iY); |
|
248 } |
|
249 // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK |
244 tpMainIconTl.SetTarget(TAlfRealPoint(rect.iTl)); |
250 tpMainIconTl.SetTarget(TAlfRealPoint(rect.iTl)); |
245 tpMainIconBr.SetTarget(TAlfRealPoint(rect.iBr)); |
251 tpMainIconBr.SetTarget(TAlfRealPoint(rect.iBr)); |
246 |
252 |
247 CFsLayoutManager::LayoutMetricsRect( |
253 CFsLayoutManager::LayoutMetricsRect( |
248 currentSize, |
254 currentSize, |
249 markIconMetrics, |
255 markIconMetrics, |
250 rect, |
256 rect, |
251 markIconVariety ); |
257 markIconVariety ); |
|
258 // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK |
|
259 if (rect.iTl.iY < 15) |
|
260 { |
|
261 rect.Move(0, 15 - rect.iTl.iY); |
|
262 } |
|
263 // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK |
252 tpMarkIconTl.SetTarget(TAlfRealPoint(rect.iTl)); |
264 tpMarkIconTl.SetTarget(TAlfRealPoint(rect.iTl)); |
253 tpMarkIconBr.SetTarget(TAlfRealPoint(rect.iBr)); |
265 tpMarkIconBr.SetTarget(TAlfRealPoint(rect.iBr)); |
254 |
266 |
255 CFsLayoutManager::LayoutMetricsRect( |
267 CFsLayoutManager::LayoutMetricsRect( |
256 currentSize, |
268 currentSize, |
257 menuIconMetrics, |
269 menuIconMetrics, |
258 rect, |
270 rect, |
259 menuIconVariety ); |
271 menuIconVariety ); |
|
272 // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK |
|
273 if (rect.iTl.iY < 15) |
|
274 { |
|
275 rect.Move(0, 15 - rect.iTl.iY); |
|
276 } |
|
277 // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK |
260 tpMenuIconTl.SetTarget(TAlfRealPoint(rect.iTl)); |
278 tpMenuIconTl.SetTarget(TAlfRealPoint(rect.iTl)); |
261 tpMenuIconBr.SetTarget(TAlfRealPoint(rect.iBr)); |
279 tpMenuIconBr.SetTarget(TAlfRealPoint(rect.iBr)); |
262 |
280 |
263 TRect textRect( currentSize ); |
281 TRect textRect( currentSize ); |
264 if (textMetrics == CFsLayoutManager::EFsLmListSingleDycRowTextPaneT1) |
282 if (textMetrics == CFsLayoutManager::EFsLmListSingleDycRowTextPaneT1) |
273 /*CFsLayoutManager::LayoutMetricsText(currentSize, textMetrics, textInfo);*/ |
291 /*CFsLayoutManager::LayoutMetricsText(currentSize, textMetrics, textInfo);*/ |
274 |
292 |
275 CFsLayoutManager::LayoutMetricsText(textRect, |
293 CFsLayoutManager::LayoutMetricsText(textRect, |
276 textMetrics, |
294 textMetrics, |
277 textInfo, textPaneVariety); |
295 textInfo, textPaneVariety); |
|
296 // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK |
|
297 if (textInfo.iTextRect.iTl.iY < 15) |
|
298 { |
|
299 textInfo.iTextRect.Move(0, 15 - textInfo.iTextRect.iTl.iY); |
|
300 } |
|
301 // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK |
278 tpTextTl.SetTarget(TAlfRealPoint(textInfo.iTextRect.iTl)); |
302 tpTextTl.SetTarget(TAlfRealPoint(textInfo.iTextRect.iTl)); |
279 tpTextBr.SetTarget(TAlfRealPoint(textInfo.iTextRect.iBr)); |
303 tpTextBr.SetTarget(TAlfRealPoint(textInfo.iTextRect.iBr)); |
280 |
304 |
281 TInt visualIconIndex = iLayout->FindVisual(iIconVisual); |
305 TInt visualIconIndex = iLayout->FindVisual(iIconVisual); |
282 if ( visualIconIndex != KErrNotFound ) |
306 if ( visualIconIndex != KErrNotFound ) |