From 46152144132f5e915c8a4a90f903c4f477ebff15 Mon Sep 17 00:00:00 2001 From: Yoann Laissus Date: Thu, 16 Aug 2012 14:59:53 +0200 Subject: - Choose the correct MainView in ZoomBar::updateSlider() It fixes issue for the first tab of new windows in case of a "wheel" zoom. - Move the zoom bounding logic from WebView::wheelEvent() to ZoomBar::setValue() It'll avoid Ctrl -/+ to exceed the max value of the slider - Use the round() method instead of my previous hack to compute zoom ratio for wheel events --- src/webview.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/webview.cpp') diff --git a/src/webview.cpp b/src/webview.cpp index 00112d61..7272e2c2 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -864,17 +864,8 @@ void WebView::wheelEvent(QWheelEvent *event) // Sync with the zoom slider if (event->modifiers() == Qt::ControlModifier) { - // Limits of the slider - if (zoomFactor() > 1.9) - setZoomFactor(1.9); - else if (zoomFactor() < 0.1) - setZoomFactor(0.1); - // Round the factor (Fix slider's end value) - int newFactor = zoomFactor() * 10; - if ((zoomFactor() * 10 - newFactor) > 0.5) - newFactor++; - + int newFactor = round(zoomFactor() * 10); emit zoomChanged(newFactor); } else if (ReKonfig::smoothScrolling() && prevPos != newPos) -- cgit v1.2.1