anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix wheel mouse scrolling bug when speed is set to 'one page at a time'.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25406 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2008-06-30 17:18:41 +00:00
parent 0bc9149eda
commit 048efafe3c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/frontends/qt4/GuiWorkArea.cpp
View File

@ -68,6 +68,8 @@
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <cmath>
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <QX11Info> #include <QX11Info>
extern "C" int XEventsQueued(Display *display, int mode); extern "C" int XEventsQueued(Display *display, int mode);
@ -775,6 +777,9 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev)
// documentation of QWheelEvent) // documentation of QWheelEvent)
int delta = ev->delta() / 120; int delta = ev->delta() / 120;
if (ev->modifiers() & Qt::ControlModifier) { if (ev->modifiers() & Qt::ControlModifier) {
// Sanity check in case the wheel mouse is set to one screen at a time.
if (delta > 1000)
delta = 20;
lyxrc.zoom -= 5 * delta; lyxrc.zoom -= 5 * delta;
if (lyxrc.zoom < 10) if (lyxrc.zoom < 10)
lyxrc.zoom = 10; lyxrc.zoom = 10;
@ -784,12 +789,20 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev)
guiApp->fontLoader().update(); guiApp->fontLoader().update();
lyx::dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE)); lyx::dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
} else { } else {
double const lines = qApp->wheelScrollLines() double scroll_value = qApp->wheelScrollLines()
* lyxrc.mouse_wheel_speed * delta; * delta * verticalScrollBar()->singleStep();
int const page_step = verticalScrollBar()->pageStep();
// Test if the wheel mouse is set to one screen at a time.
if (fabs(scroll_value) > page_step)
scroll_value = scroll_value > 0 ? page_step : - page_step;
// Take into account user preference.
scroll_value *= lyxrc.mouse_wheel_speed;
LYXERR(Debug::SCROLLING, "wheelScrollLines = " << qApp->wheelScrollLines() LYXERR(Debug::SCROLLING, "wheelScrollLines = " << qApp->wheelScrollLines()
<< " delta = " << ev->delta() << " lines = " << lines); << " delta = " << ev->delta() << " scroll_value = " << scroll_value
verticalScrollBar()->setValue(verticalScrollBar()->value() - << " page_step = " << page_step);
int(lines * verticalScrollBar()->singleStep())); // Now scroll.
verticalScrollBar()->setValue(verticalScrollBar()->value()
- int(scroll_value));
} }
ev->accept(); ev->accept();
} }