X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=6de832dae58715af6b55b0286c882e39595b596d;hb=c7ad447f98758c1797f4dc3d7371326bcfa842a0;hp=658fa0e6000225e237618af2789092dfb961857e;hpb=1db691c2f501c07c38ffaa69cd1af18e1f77f4dc;p=lyx.git diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 658fa0e600..6de832dae5 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -351,11 +351,12 @@ BufferView::~BufferView() int BufferView::rightMargin() const { + // The value used to be hardcoded to 10, which is 2.5mm at 100dpi + int const default_margin = Length(2.5, Length::MM).inPixels(0); // The additional test for the case the outliner is opened. - if (!full_screen_ || - !lyxrc.full_screen_limit || - width_ < lyxrc.full_screen_width + 20) - return 10; + if (!full_screen_ || !lyxrc.full_screen_limit + || width_ < lyxrc.full_screen_width + 2 * default_margin) + return default_margin; return (width_ - lyxrc.full_screen_width) / 2; } @@ -433,7 +434,7 @@ bool BufferView::needsFitCursor() const void BufferView::processUpdateFlags(Update::flags flags) { // This is close to a hot-path. - LYXERR(Debug::DEBUG, "BufferView::processUpdateFlags()" + LYXERR(Debug::PAINTING, "BufferView::processUpdateFlags()" << "[fitcursor = " << (flags & Update::FitCursor) << ", forceupdate = " << (flags & Update::Force) << ", singlepar = " << (flags & Update::SinglePar) @@ -808,6 +809,8 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos, setCursor(dit); // set the current font. d->cursor_.setCurrentFont(); + // Do not forget to reset the anchor (see #9912) + d->cursor_.resetAnchor(); // To center the screen on this new position we need the // paragraph position which is computed at draw() time. // So we need a redraw! @@ -1124,16 +1127,6 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) || getInsetByCode(cur, REF_CODE)); break; - case LFUN_CHANGES_TRACK: - flag.setEnabled(true); - flag.setOnOff(buffer_.params().track_changes); - break; - - case LFUN_CHANGES_OUTPUT: - flag.setEnabled(true); - flag.setOnOff(buffer_.params().output_changes); - break; - case LFUN_CHANGES_MERGE: case LFUN_CHANGE_NEXT: case LFUN_CHANGE_PREVIOUS: @@ -1146,16 +1139,6 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) flag.setEnabled(true); break; - case LFUN_BUFFER_TOGGLE_COMPRESSION: { - flag.setOnOff(buffer_.params().compressed); - break; - } - - case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC: { - flag.setOnOff(buffer_.params().output_sync); - break; - } - case LFUN_SCREEN_UP: case LFUN_SCREEN_DOWN: case LFUN_SCROLL: @@ -1458,33 +1441,6 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) break; } - case LFUN_CHANGES_TRACK: - buffer_.params().track_changes = !buffer_.params().track_changes; - break; - - case LFUN_CHANGES_OUTPUT: - buffer_.params().output_changes = !buffer_.params().output_changes; - if (buffer_.params().output_changes) { - bool dvipost = LaTeXFeatures::isAvailable("dvipost"); - bool xcolorulem = LaTeXFeatures::isAvailable("ulem") && - LaTeXFeatures::isAvailable("xcolor"); - - if (!dvipost && !xcolorulem) { - Alert::warning(_("Changes not shown in LaTeX output"), - _("Changes will not be highlighted in LaTeX output, " - "because neither dvipost nor xcolor/ulem are installed.\n" - "Please install these packages or redefine " - "\\lyxadded and \\lyxdeleted in the LaTeX preamble.")); - } else if (!xcolorulem) { - Alert::warning(_("Changes not shown in LaTeX output"), - _("Changes will not be highlighted in LaTeX output " - "when using pdflatex, because xcolor and ulem are not installed.\n" - "Please install both packages or redefine " - "\\lyxadded and \\lyxdeleted in the LaTeX preamble.")); - } - } - break; - case LFUN_CHANGE_NEXT: findNextChange(this); // FIXME: Move this LFUN to Buffer so that we don't have to do this: @@ -1724,15 +1680,6 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } break; - case LFUN_BUFFER_TOGGLE_COMPRESSION: - // turn compression on/off - buffer_.params().compressed = !buffer_.params().compressed; - break; - - case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC: - buffer_.params().output_sync = !buffer_.params().output_sync; - break; - case LFUN_SCREEN_UP: case LFUN_SCREEN_DOWN: { Point p = getPos(cur); @@ -1861,6 +1808,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) cur.pit() = cur.lastpit(); cur.pos() = cur.lastpos(); } + cur.setCurrentFont(); dr.screenUpdate(Update::Force); break; @@ -2257,7 +2205,7 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) // cursor in front of the inset. if (inset->hasSettings() && cur.nextInset() != inset && cur.prevInset() == inset) - cur.backwardPos(); + cur.posBackward(); } // Put anchor at the same position. @@ -2564,8 +2512,11 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select) // FIXME: (2) if we had a working InsetText::notifyCursorLeaves, // the leftinset bool would not be necessary (badcursor instead). bool update = leftinset; - if (!do_selection && d->cursor_.inTexted()) + if (!do_selection && d->cursor_.inTexted()) { update |= checkDepm(cur, d->cursor_); + if (cur.pos() && cur.paragraph().isEnvSeparator(cur.pos() - 1)) + cur.posBackward(); + } if (!do_selection) d->cursor_.resetAnchor(); @@ -3004,13 +2955,9 @@ void BufferView::checkCursorScrollOffset(PainterInfo & pi) // Set the row on which the cursor lives. setCurrentRowSlice(rowSlice); - // Current x position of the cursor in pixels - int cur_x = getPos(d->cursor_).x_; - - // If cursor offset is left margin and offset is not the leftmost - // position of the row, there is a cache problem. - if (cur_x == row.left_margin && !row.empty() - && d->cursor_.pos() != row.front().left_pos()) { + // If insets referred to by cursor are not all in the cache, the positions + // need to be recomputed. + if (!d->cursor_.inCoordCache()) { /** FIXME: the code below adds an extraneous computation of * inset positions, and can therefore be bad for performance * (think for example about a very large tabular inset. @@ -3025,7 +2972,8 @@ void BufferView::checkCursorScrollOffset(PainterInfo & pi) * cache. This would not happen if we did not have two-stage * drawing. * - * A proper fix should be found and this code should be removed. + * A proper fix would be to always have proper inset positions + * at this point. */ // Force the recomputation of inset positions bool const drawing = pi.pain.isDrawingEnabled(); @@ -3035,25 +2983,34 @@ void BufferView::checkCursorScrollOffset(PainterInfo & pi) -d->horiz_scroll_offset_, 0); rp.paintText(); pi.pain.setDrawingEnabled(drawing); - - // Recompute current Current x position of the cursor in pixels - cur_x = getPos(d->cursor_).x_; } + // Current x position of the cursor in pixels + int cur_x = getPos(d->cursor_).x_; + // Horizontal scroll offset of the cursor row in pixels int offset = d->horiz_scroll_offset_; - int const MARGIN = 2 * theFontMetrics(d->cursor_.real_current_font).em(); - //lyxerr << "cur_x=" << cur_x << ", offset=" << offset << ", margin=" << MARGIN << endl; - 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; + int const MARGIN = 2 * theFontMetrics(d->cursor_.real_current_font).em() + + row.right_margin; + if (row.right_x() <= workWidth() - row.right_margin) { + // Row is narrower than the work area, no offset needed. + offset = 0; + } else { + if (cur_x - offset < MARGIN) { + // cursor would be too far right + offset = cur_x - MARGIN; + } else if (cur_x - offset > workWidth() - MARGIN) { + // cursor would be too far left + offset = cur_x - workWidth() + MARGIN; + } + // Correct the offset to make sure that we do not scroll too much + if (offset < 0) + offset = 0; + if (row.right_x() - offset < workWidth() - row.right_margin) + offset = row.right_x() - workWidth() + row.right_margin; } - if (offset < row.left_margin || row.width() <= workWidth()) - offset = 0; + //lyxerr << "cur_x=" << cur_x << ", offset=" << offset << ", row.wid=" << row.width() << ", margin=" << MARGIN << endl; if (offset != d->horiz_scroll_offset_) LYXERR(Debug::PAINTING, "Horiz. scroll offset changed from "