equal
deleted
inserted
replaced
61 , m_zoomOutBaseLevel(0) |
61 , m_zoomOutBaseLevel(0) |
62 , m_pinchCenterSet(false) |
62 , m_pinchCenterSet(false) |
63 , m_zoomStepSize(0) |
63 , m_zoomStepSize(0) |
64 , m_pinchActive(false) |
64 , m_pinchActive(false) |
65 , m_pinchCenter(0,0) |
65 , m_pinchCenter(0,0) |
66 , m_isPluginsVisible(true) |
|
67 { |
66 { |
68 } |
67 } |
69 |
68 |
70 // ----------------------------------------------------------------------------- |
69 // ----------------------------------------------------------------------------- |
71 // WebPagePinchZoomHandler::constructL |
70 // WebPagePinchZoomHandler::constructL |
185 // ----------------------------------------------------------------------------- |
184 // ----------------------------------------------------------------------------- |
186 // setZoomLevelL |
185 // setZoomLevelL |
187 // ----------------------------------------------------------------------------- |
186 // ----------------------------------------------------------------------------- |
188 void WebPagePinchZoomHandler::setZoomLevelL(int zoomLevel) |
187 void WebPagePinchZoomHandler::setZoomLevelL(int zoomLevel) |
189 { |
188 { |
190 if (m_isPluginsVisible) { |
|
191 m_webView->mainFrame()->makeVisiblePlugins(false); |
|
192 m_isPluginsVisible = false; |
|
193 } |
|
194 m_webView->setPinchBitmapZoomLevelL(zoomLevel); |
189 m_webView->setPinchBitmapZoomLevelL(zoomLevel); |
195 } |
190 } |
196 |
191 |
197 // ----------------------------------------------------------------------------- |
192 // ----------------------------------------------------------------------------- |
198 // isPinchActive |
193 // isPinchActive |
210 // ----------------------------------------------------------------------------- |
205 // ----------------------------------------------------------------------------- |
211 // updateBitmap |
206 // updateBitmap |
212 // ----------------------------------------------------------------------------- |
207 // ----------------------------------------------------------------------------- |
213 void WebPagePinchZoomHandler::updateBitmap(void) |
208 void WebPagePinchZoomHandler::updateBitmap(void) |
214 { |
209 { |
215 m_isPluginsVisible = true; |
|
216 m_bitmapUpdateTimer->Cancel(); |
210 m_bitmapUpdateTimer->Cancel(); |
217 m_webView->restoreZoomLevel(m_webView->scalingFactor()); |
211 m_webView->restoreZoomLevel(m_webView->scalingFactor()); |
218 //update the plugin rect after pinch zoom exit |
212 //update the plugin rect after pinch zoom exit |
219 m_webView->mainFrame()->notifyPluginsOfPositionChange(); |
213 m_webView->mainFrame()->notifyPluginsOfPositionChange(); |
220 m_webView->startCheckerBoardDestroyTimer(); |
214 m_webView->startCheckerBoardDestroyTimer(); |