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

Fine tune the scroll offset setting code

Browse Source 
The new code should feel a bit more natural. It avoids explicit pixel values for the margins and does not scroll in some cases where it is not necessary.
This commit is contained in:
Jean-Marc Lasgouttes 2014-07-26 16:25:56 +02:00
parent 5a361b35cf
commit a7ba04dbaf
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BufferView.cpp
View File

@ -35,6 +35,7 @@
#include "Language.h"
#include "LaTeXFeatures.h"
#include "LayoutFile.h"
#include "Length.h"
#include "Lexer.h"
#include "LyX.h"
#include "LyXAction.h"
@ -2937,20 +2938,17 @@ void BufferView::checkCursorScrollOffset(PainterInfo & pi)
// Horizontal scroll offset of the cursor row in pixels
int offset = d->horiz_scroll_offset_;
int const MARGIN = 10;
int const MARGIN = Length(2, Length::EM).inPixels(workWidth());
if (cur_x < offset + MARGIN) {
// scroll right
offset = cur_x - MARGIN;
} else if (cur_x > offset + workWidth() - MARGIN) {
// scroll left
offset = cur_x - workWidth() + MARGIN;
} else if(offset > 0
&& row.width() - offset < workWidth()){
offset = row.width() - workWidth();
}
if (offset != d->horiz_scroll_offset_)
LYXERR0("Offset is now " << offset);
if (offset < 0 || row.width() <= workWidth())
offset = 0;
if (d->update_strategy_ == NoScreenUpdate
&& (offset != d->horiz_scroll_offset_