diff -r 4bd5176e1bc8 -r a1a5d4e727e8 webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.cpp Tue May 25 13:52:38 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.cpp Wed Jun 09 10:52:50 2010 +0300 @@ -28,8 +28,7 @@ using namespace WebCore; -const int KFullScreenButtonHeight = 60; -const int KFullScreenButtonWidth = 60; +const int KFullScreenButtonOffset = 50; const int KFullScreenButtonBuff = 5; // ----------------------------------------------------------------------------- @@ -66,6 +65,9 @@ m_buttonIcon = StaticObjectsContainer::instance()->webCannedImages()->getImage(WebCannedImages::EImageEscFullScreen); TPoint pos = CalculatePosition(); BaseConstructL(m_webView, pos, m_buttonIcon.m_img, m_buttonIcon.m_msk, ETrue); + if (AknLayoutUtils::PenEnabled()) { + DrawableWindow()->SetPointerGrab(ETrue); + } Hide(); } @@ -147,11 +149,18 @@ case TPointerEvent::EButton1Up: { - if (m_isTouchDown) { - Hide(); - m_webView->notifyFullscreenModeChangeL( false ); - } - m_isTouchDown = EFalse; + TPoint fsPostion = PositionRelativeToScreen(); + TRect fsRect = TRect(fsPostion,m_buttonIcon.m_img->SizeInPixels()); + fsRect = TRect(fsRect.iTl - TPoint(KFullScreenButtonOffset,KFullScreenButtonOffset), fsRect.iBr); + TPoint pointerPosition = fsPostion + aPointerEvent.iPosition; + if( fsRect.Contains(pointerPosition)) + { + if (m_isTouchDown) { + Hide(); + m_webView->notifyFullscreenModeChangeL( false ); + } + m_isTouchDown = EFalse; + } } break; }