From afaff4050fa5ce0afad23930f4620a7546c267f9 Mon Sep 17 00:00:00 2001 From: Yoann Laissus Date: Sun, 6 Jun 2010 21:33:29 +0200 Subject: Fix the end value of the zoom slider with mouse wheel zoom --- src/webview.cpp | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/webview.cpp b/src/webview.cpp index 061dd256..0633bc9b 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -498,19 +498,30 @@ void WebView::keyPressEvent(QKeyEvent *event) void WebView::wheelEvent(QWheelEvent *event) { + KWebView::wheelEvent(event); + + // Sync with the zoom slider if (event->modifiers() == Qt::ControlModifier) { - emit zoomChanged(zoomFactor()); + // 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++; + + + emit zoomChanged((qreal)newFactor / 10); } - KWebView::wheelEvent(event); - // Limits of the slider - if (zoomFactor() > 1.9) - setZoomFactor(1.9); - else if (zoomFactor() < 0.1) - setZoomFactor(0.1); + + } -- cgit v1.2.1