Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

Fixed zooming with Ctrl+wheel for some users.

Browse Source 
closes #451
This commit is contained in:
nowrep 2012-07-13 18:00:03 +02:00
parent 232350c910
commit 69aeeac1be
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -1,6 +1,7 @@
Version 1.3.1 Version 1.3.1
* not yet released * not yet released
* Ctrl+Enter shortcut in PIM plugin now also works with enter on numpad * Ctrl+Enter shortcut in PIM plugin now also works with enter on numpad
* fixed zooming with Ctrl+Wheel for some users
* fixed issues with cookies filtering * fixed issues with cookies filtering
* fixed $subdocument matching in AdBlock * fixed $subdocument matching in AdBlock
* fixed $third-party in AdBlock rules when Referer header is empty * fixed $third-party in AdBlock rules when Referer header is empty

4
src/lib/tools/buttonwithmenu.cpp
View File

@ -108,9 +108,7 @@ void ButtonWithMenu::wheelEvent(QWheelEvent* event)
return; return;
} }
int numDegrees = event->delta() / 8; if (event->delta() > 0) {
int numSteps = numDegrees / 15;
if (numSteps == 1) {
if (currItemIndex != 0) { if (currItemIndex != 0) {
setCurrentItem(m_items.at(currItemIndex - 1)); setCurrentItem(m_items.at(currItemIndex - 1));
} }

10
src/lib/webview/webview.cpp
View File

@ -952,15 +952,9 @@ void WebView::wheelEvent(QWheelEvent* event)
} }
if (event->modifiers() & Qt::ControlModifier) { if (event->modifiers() & Qt::ControlModifier) {
int numDegrees = event->delta() / 8; event->delta() > 0 ? zoomIn() : zoomOut();
int numSteps = numDegrees / 15;
if (numSteps == 1) {
zoomIn();
}
else {
zoomOut();
}
event->accept(); event->accept();
return; return;
} }