equal
deleted
inserted
replaced
159 m_pinchCenter.iY = pinchCenter.iY / 2; |
159 m_pinchCenter.iY = pinchCenter.iY / 2; |
160 m_pinchCenterSet = true; |
160 m_pinchCenterSet = true; |
161 if (zoomStepSize < 0) m_zoomOutBaseLevel = currentZoom / 2; |
161 if (zoomStepSize < 0) m_zoomOutBaseLevel = currentZoom / 2; |
162 } |
162 } |
163 if (!(zoomStepSize < 0 && zoomValue < m_zoomOutBaseLevel)) |
163 if (!(zoomStepSize < 0 && zoomValue < m_zoomOutBaseLevel)) |
164 setZoomLevel(zoomValue); |
164 setZoomLevelL(zoomValue); |
165 |
165 |
166 } |
166 } |
167 } |
167 } |
168 |
168 |
169 // ----------------------------------------------------------------------------- |
169 // ----------------------------------------------------------------------------- |
181 m_pinchExitWaitTimer->Start( KPinchExitWaitTimeout,0,TCallBack(&pinchExitWaitTimerCb,this)); |
181 m_pinchExitWaitTimer->Start( KPinchExitWaitTimeout,0,TCallBack(&pinchExitWaitTimerCb,this)); |
182 |
182 |
183 } |
183 } |
184 |
184 |
185 // ----------------------------------------------------------------------------- |
185 // ----------------------------------------------------------------------------- |
186 // setZoomLevel |
186 // setZoomLevelL |
187 // ----------------------------------------------------------------------------- |
187 // ----------------------------------------------------------------------------- |
188 void WebPagePinchZoomHandler::setZoomLevel(int zoomLevel) |
188 void WebPagePinchZoomHandler::setZoomLevelL(int zoomLevel) |
189 { |
189 { |
190 if (m_isPluginsVisible) { |
190 if (m_isPluginsVisible) { |
191 m_webView->mainFrame()->makeVisiblePlugins(false); |
191 m_webView->mainFrame()->makeVisiblePlugins(false); |
192 m_isPluginsVisible = false; |
192 m_isPluginsVisible = false; |
193 } |
193 } |
194 m_webView->setPinchBitmapZoomLevel(zoomLevel); |
194 m_webView->setPinchBitmapZoomLevelL(zoomLevel); |
195 } |
195 } |
196 |
196 |
197 // ----------------------------------------------------------------------------- |
197 // ----------------------------------------------------------------------------- |
198 // isPinchActive |
198 // isPinchActive |
199 // ----------------------------------------------------------------------------- |
199 // ----------------------------------------------------------------------------- |
219 PluginSkin* pluginskin = m_webView->mainFrame()->focusedPlugin(); |
219 PluginSkin* pluginskin = m_webView->mainFrame()->focusedPlugin(); |
220 if(pluginskin) |
220 if(pluginskin) |
221 { |
221 { |
222 pluginskin->setPluginWinClipedRect(); |
222 pluginskin->setPluginWinClipedRect(); |
223 } |
223 } |
224 |
224 m_webView->startCheckerBoardDestroyTimer(); |
225 } |
225 } |
226 |
226 |
227 // ----------------------------------------------------------------------------- |
227 // ----------------------------------------------------------------------------- |
228 // handlepinchExitWaitTimer |
228 // handlepinchExitWaitTimer |
229 // ----------------------------------------------------------------------------- |
229 // ----------------------------------------------------------------------------- |