diff -r 7c90e6132015 -r 10e98eab6f85 webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.h --- a/webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.h Fri May 08 08:25:06 2009 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.h Fri Jul 03 15:54:40 2009 +0100 @@ -24,7 +24,9 @@ #include #include #include -#include +#include "WebSprite.h" +#include "WebCannedImages.h" + // MACROS // FORWARD DECLARATIONS @@ -32,7 +34,8 @@ class WebFrame; // CLASS DECLARATION -class WebPageFullScreenHandler: public CBase, public MAknWsEventObserver { +class WebPageFullScreenHandler: public CWebSprite +{ public: // Constructor and destructor /** @@ -55,14 +58,10 @@ /** * By default Symbian 2nd phase constructor is private. **/ - void constructL(); + void ConstructL(); - TBool HitRegionContains(const TPoint& aPoint); - void HandleWsEventL(const TWsEvent& aEvent,CCoeControl* aDestination); - void AddWsObserverToControl(); - void constructSprite(); - void destructSprite(); - + TPoint CalculatePosition(); + public: // New functions @@ -94,17 +93,14 @@ **/ void SizeChanged(void); - + void HandlePointerEventL(const TPointerEvent& aPointerEvent); private: // Pointer to owning view WebView* m_webView; // not owned - CAknWsEventMonitor* m_eventMonitor; // not owned - RWsSprite m_sprite; - TBool m_spriteVisible; - TBool m_tappedOnSprite; - TPoint m_pos; + TBool m_isTouchDown; + TCannedImageData m_buttonIcon; }; #endif //WEBPAGEFULLSCREENHANDLER_H