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) |
66 { |
67 { |
67 } |
68 } |
68 |
69 |
69 // ----------------------------------------------------------------------------- |
70 // ----------------------------------------------------------------------------- |
70 // WebPagePinchZoomHandler::constructL |
71 // WebPagePinchZoomHandler::constructL |
184 // ----------------------------------------------------------------------------- |
185 // ----------------------------------------------------------------------------- |
185 // setZoomLevel |
186 // setZoomLevel |
186 // ----------------------------------------------------------------------------- |
187 // ----------------------------------------------------------------------------- |
187 void WebPagePinchZoomHandler::setZoomLevel(int zoomLevel) |
188 void WebPagePinchZoomHandler::setZoomLevel(int zoomLevel) |
188 { |
189 { |
|
190 if (m_isPluginsVisible) { |
|
191 m_webView->mainFrame()->makeVisiblePlugins(false); |
|
192 m_isPluginsVisible = false; |
|
193 } |
189 m_webView->setPinchBitmapZoomLevel(zoomLevel); |
194 m_webView->setPinchBitmapZoomLevel(zoomLevel); |
190 } |
195 } |
191 |
196 |
192 // ----------------------------------------------------------------------------- |
197 // ----------------------------------------------------------------------------- |
193 // isPinchActive |
198 // isPinchActive |
205 // ----------------------------------------------------------------------------- |
210 // ----------------------------------------------------------------------------- |
206 // updateBitmap |
211 // updateBitmap |
207 // ----------------------------------------------------------------------------- |
212 // ----------------------------------------------------------------------------- |
208 void WebPagePinchZoomHandler::updateBitmap(void) |
213 void WebPagePinchZoomHandler::updateBitmap(void) |
209 { |
214 { |
|
215 m_isPluginsVisible = true; |
210 m_bitmapUpdateTimer->Cancel(); |
216 m_bitmapUpdateTimer->Cancel(); |
211 m_webView->restoreZoomLevel(m_webView->scalingFactor()); |
217 m_webView->restoreZoomLevel(m_webView->scalingFactor()); |
212 //update the plugin rect after pinch zoom exit |
218 //update the plugin rect after pinch zoom exit |
213 PluginSkin* pluginskin = m_webView->mainFrame()->focusedPlugin(); |
219 PluginSkin* pluginskin = m_webView->mainFrame()->focusedPlugin(); |
214 if(pluginskin) |
220 if(pluginskin) |