equal
deleted
inserted
replaced
488 if (visible) { |
488 if (visible) { |
489 cursor->setCurrentView(*this); |
489 cursor->setCurrentView(*this); |
490 //Reset the iFocusedElementType to be the same as before the second window is opened. |
490 //Reset the iFocusedElementType to be the same as before the second window is opened. |
491 cursor->setPosition(m_savedCursorPosition); |
491 cursor->setPosition(m_savedCursorPosition); |
492 cursor->updatePositionAndElemType(m_savedCursorPosition); |
492 cursor->updatePositionAndElemType(m_savedCursorPosition); |
|
493 if ( m_widgetextension && m_focusedElementType == TBrCtlDefs::EElementSelectBox){ |
|
494 m_focusedElementType = TBrCtlDefs::EElementNone; |
|
495 } |
493 } else |
496 } else |
494 m_savedCursorPosition = cursor->position(); |
497 m_savedCursorPosition = cursor->position(); |
495 cursor->cursorUpdate(visible & !AknLayoutUtils::PenEnabled()); |
498 cursor->cursorUpdate(visible & !AknLayoutUtils::PenEnabled()); |
496 } |
499 } |
497 Frame* f = m_page->mainFrame(); |
500 Frame* f = m_page->mainFrame(); |
530 |
533 |
531 void WebView::doLayout() |
534 void WebView::doLayout() |
532 { |
535 { |
533 |
536 |
534 int zoomLevel = m_currentZoomLevel; |
537 int zoomLevel = m_currentZoomLevel; |
535 if(!( m_widgetextension && m_widgetextension->IsWidgetPublising())) { |
538 if(m_widgetextension && !(m_widgetextension->IsWidgetPublising())) { |
536 zoomLevelChanged( KZoomLevelDefaultValue ); |
539 zoomLevelChanged( KZoomLevelDefaultValue ); |
537 } |
540 } |
538 Frame* f = m_page->mainFrame(); |
541 Frame* f = m_page->mainFrame(); |
539 |
542 |
540 while ( f ) { |
543 while ( f ) { |
2489 // zoom it |
2492 // zoom it |
2490 m_lastZoomLevel = m_currentZoomLevel; |
2493 m_lastZoomLevel = m_currentZoomLevel; |
2491 |
2494 |
2492 setZoomLevel(zoomLevel); |
2495 setZoomLevel(zoomLevel); |
2493 mainFrame()->notifyPluginsOfScrolling(); |
2496 mainFrame()->notifyPluginsOfScrolling(); |
2494 } |
2497 |
|
2498 if (zoomLevel == KZoomLevelDefaultValue) |
|
2499 { |
|
2500 // for pages based on tables this is required |
|
2501 doLayout(); |
|
2502 } |
|
2503 |
|
2504 } |
2495 |
2505 |
2496 //------------------------------------------------------------------------------- |
2506 //------------------------------------------------------------------------------- |
2497 // WebView::openPluginPlayerL |
2507 // WebView::openPluginPlayerL |
2498 // Called when user clicks a plugin which is able to accept user input, |
2508 // Called when user clicks a plugin which is able to accept user input, |
2499 // this feature is only used in US build |
2509 // this feature is only used in US build |