anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix scroll wheel on mac (bug #6775)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34731 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2010-06-30 12:38:39 +00:00
parent af928c503d
commit 50117dc8ea
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -816,9 +816,9 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev)
{
// Wheel rotation by one notch results in a delta() of 120 (see
// documentation of QWheelEvent)
int const delta = ev->delta() / 120;
double const delta = ev->delta() / 120.0;
if (ev->modifiers() & Qt::ControlModifier) {
docstring arg = convert<docstring>(5 * delta);
docstring arg = convert<docstring>(int(5 * delta));
lyx::dispatch(FuncRequest(LFUN_BUFFER_ZOOM_IN, arg));
return;
}
@ -830,11 +830,8 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev)
int scroll_value = lines > page_step
? page_step : lines * verticalScrollBar()->singleStep();
// Take into account the rotation.
scroll_value *= delta;
// Take into account user preference.
scroll_value = int(scroll_value * lyxrc.mouse_wheel_speed);
// Take into account the rotation and the user preferences.
scroll_value = int(scroll_value * delta * lyxrc.mouse_wheel_speed);
LYXERR(Debug::SCROLLING, "wheelScrollLines = " << lines
<< " delta = " << delta << " scroll_value = " << scroll_value
<< " page_step = " << page_step);