]> git.lyx.org Git - lyx.git/blobdiff - src/RowPainter.cpp
Avoid duplicating mode changing commands
[lyx.git] / src / RowPainter.cpp
index 1c2b65dfab7030391746fc329dd4e159a96ba7b0..0bbcb5723d3743bdb4d3d7319c9806328295ac54 100644 (file)
@@ -45,6 +45,8 @@
 #include "support/lassert.h"
 #include <boost/crc.hpp>
 
+#include <stdlib.h>
+
 using namespace std;
 
 namespace lyx {
@@ -54,38 +56,21 @@ using frontend::FontMetrics;
 
 
 RowPainter::RowPainter(PainterInfo & pi,
-       Text const & text, pit_type pit, Row const & row, int x, int y)
+       Text const & text, Row const & row, int x, int y)
        : pi_(pi), text_(text),
          text_metrics_(pi_.base.bv->textMetrics(&text)),
          pars_(text.paragraphs()),
-         row_(row), pit_(pit), par_(text.paragraphs()[pit]),
-         pm_(text_metrics_.parMetrics(pit)), change_(pi_.change_),
-         xo_(x), yo_(y), width_(text_metrics_.width()),
-         solid_line_thickness_(1), solid_line_offset_(1),
-         dotted_line_thickness_(1)
+         row_(row), par_(text.paragraphs()[row.pit()]),
+         pm_(text_metrics_.parMetrics(row.pit())), change_(pi_.change_),
+         xo_(x), yo_(y), width_(text_metrics_.width())
 {
-       if (lyxrc.zoom >= 200) {
-               // derive the line thickness from zoom factor
-               // the zoom is given in percent
-               // (increase thickness at 250%, 450% etc.)
-               solid_line_thickness_ = (lyxrc.zoom + 50) / 200;
-               // adjust line_offset_ too
-               solid_line_offset_ = 1 + solid_line_thickness_ / 2;
-       }
-       if (lyxrc.zoom >= 100) {
-               // derive the line thickness from zoom factor
-               // the zoom is given in percent
-               // (increase thickness at 150%, 250% etc.)
-               dotted_line_thickness_ = (lyxrc.zoom + 50) / 100;
-       }
-
        x_ = row_.left_margin + xo_;
 
        //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
        //row_.dump();
 
-       LBUFERR(pit >= 0);
-       LBUFERR(pit < int(text.paragraphs().size()));
+       LBUFERR(row.pit() >= 0);
+       LBUFERR(row.pit() < int(text.paragraphs().size()));
 }
 
 
@@ -165,9 +150,10 @@ void RowPainter::paintForeignMark(Row::Element const & e) const
                return;
 
        int const desc = e.inset ? e.dim.descent() : 0;
-       int const y = yo_ + solid_line_offset_ + desc + solid_line_thickness_ / 2;
+       int const y = yo_ + pi_.base.solidLineOffset()
+               + desc + pi_.base.solidLineThickness() / 2;
        pi_.pain.line(int(x_), y, int(x_ + e.full_width()), y, Color_language,
-               Painter::line_solid, solid_line_thickness_);
+                     Painter::line_solid, pi_.base.solidLineThickness());
 }
 
 
@@ -177,8 +163,8 @@ void RowPainter::paintMisspelledMark(Row::Element const & e) const
        // to avoid drawing at the same vertical offset
        FontMetrics const & fm = theFontMetrics(e.font);
        int const thickness = max(fm.lineWidth(), 2);
-       int const y = yo_ + solid_line_offset_ + solid_line_thickness_
-               + (e.change.changed() ? solid_line_thickness_ + 1 : 0)
+       int const y = yo_ + pi_.base.solidLineOffset() + pi_.base.solidLineThickness()
+               + (e.change.changed() ? pi_.base.solidLineThickness() + 1 : 0)
                + 1 + thickness / 2;
 
        //FIXME: this could be computed only once, it is probably not costly.
@@ -220,7 +206,8 @@ void RowPainter::paintMisspelledMark(Row::Element const & e) const
                if (x1 > x2)
                        swap(x1, x2);
 
-               pi_.pain.line(x_ + x1, y, x_ + x2, y, Color_error,
+               pi_.pain.line(int(x_ + x1), y, int(x_ + x2), y, 
+                             Color_error,
                              Painter::line_onoffdash, thickness);
                pos = range.last + 1;
        }
@@ -255,14 +242,7 @@ void RowPainter::paintStringAndSel(Row::Element const & e) const
 
 void RowPainter::paintChange(Row::Element const & e) const
 {
-       if (!e.change.changed())
-               return;
-       // Calculate 1/3 height of font
-       FontMetrics const & fm = theFontMetrics(e.font);
-       int const y_bar = e.change.deleted() ? yo_ - fm.maxAscent() / 3
-               : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
-       pi_.pain.line(int(x_), y_bar, int(x_ + e.full_width()), y_bar,
-                     e.change.color(), Painter::line_solid, solid_line_thickness_);
+       e.change.paintCue(pi_, x_, yo_, x_ + e.full_width(), e.font.fontInfo());
 }
 
 
@@ -280,7 +260,7 @@ void RowPainter::paintChangeBar() const
        if (start == end || !par_.isChanged(start, end))
                return;
 
-       int const height = text_metrics_.isLastRow(pit_, row_)
+       int const height = text_metrics_.isLastRow(row_)
                ? row_.ascent()
                : row_.height();
 
@@ -312,16 +292,16 @@ void RowPainter::paintDepthBar() const
                return;
 
        depth_type prev_depth = 0;
-       if (!text_metrics_.isFirstRow(pit_, row_)) {
-               pit_type pit2 = pit_;
+       if (!text_metrics_.isFirstRow(row_)) {
+               pit_type pit2 = row_.pit();
                if (row_.pos() == 0)
                        --pit2;
                prev_depth = pars_[pit2].getDepth();
        }
 
        depth_type next_depth = 0;
-       if (!text_metrics_.isLastRow(pit_, row_)) {
-               pit_type pit2 = pit_;
+       if (!text_metrics_.isLastRow(row_)) {
+               pit_type pit2 = row_.pit();
                if (row_.endpos() >= pars_[pit2].size())
                        ++pit2;
                next_depth = pars_[pit2].getDepth();
@@ -373,16 +353,17 @@ void RowPainter::paintAppendixStart(int y) const
 void RowPainter::paintTooLargeMarks(bool const left, bool const right) const
 {
        if (left)
-               pi_.pain.line(dotted_line_thickness_, yo_ - row_.ascent(),
-                                         dotted_line_thickness_, yo_ + row_.descent(),
-                                         Color_scroll,
-                                         Painter::line_onoffdash, dotted_line_thickness_);
+               pi_.pain.line(pi_.base.dottedLineThickness(), yo_ - row_.ascent(),
+                                         pi_.base.dottedLineThickness(), yo_ + row_.descent(),
+                                         Color_scroll, Painter::line_onoffdash,
+                             pi_.base.dottedLineThickness());
        if (right) {
-               int const wwidth = pi_.base.bv->workWidth() - dotted_line_thickness_;
+               int const wwidth =
+                       pi_.base.bv->workWidth() - pi_.base.dottedLineThickness();
                pi_.pain.line(wwidth, yo_ - row_.ascent(),
                                          wwidth, yo_ + row_.descent(),
-                                         Color_scroll,
-                                         Painter::line_onoffdash, dotted_line_thickness_);
+                                         Color_scroll, Painter::line_onoffdash,
+                             pi_.base.dottedLineThickness());
        }
 }
 
@@ -396,7 +377,7 @@ void RowPainter::paintFirst() const
            paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
 
        bool const is_first =
-               text_.isFirstInSequence(pit_) || !layout.isParagraphGroup();
+               text_.isFirstInSequence(row_.pit()) || !layout.isParagraphGroup();
        //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
 
        if (layout.labelIsInline()
@@ -409,7 +390,7 @@ void RowPainter::paintFirst() const
 
 void RowPainter::paintLabel() const
 {
-       docstring const str = par_.labelString();
+       docstring const str = par_.labelString();
        if (str.empty())
                return;
 
@@ -500,7 +481,7 @@ static int getEndLabel(pit_type p, Text const & text)
 void RowPainter::paintLast() const
 {
        bool const is_rtl = text_.isRTL(par_);
-       int const endlabel = getEndLabel(pit_, text_);
+       int const endlabel = getEndLabel(row_.pit(), text_);
 
        // paint imaginary end-of-paragraph character
 
@@ -532,14 +513,17 @@ void RowPainter::paintLast() const
                FontMetrics const & fm = theFontMetrics(font);
                int const size = int(0.75 * fm.maxAscent());
                int const y = yo_ - size;
-               int const max_row_width = width_ - size - Inset::TEXT_TO_INSET_OFFSET;
-               int x = is_rtl ? nestMargin() + changebarMargin()
-                       : max_row_width - row_.right_margin;
 
                // If needed, move the box a bit to avoid overlapping with text.
-               int const rem = max_row_width - row_.width();
-               if (rem <= 0)
-                       x += is_rtl ? rem : - rem;
+               int x = 0;
+               if (is_rtl) {
+                       int const normal_x = nestMargin() + changebarMargin();
+                       x = min(normal_x, row_.left_margin - size - Inset::TEXT_TO_INSET_OFFSET);
+               } else {
+                       int const normal_x = width_ - row_.right_margin
+                               - size - Inset::TEXT_TO_INSET_OFFSET;
+                       x = max(normal_x, row_.width());
+               }
 
                if (endlabel == END_LABEL_BOX)
                        pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
@@ -570,14 +554,14 @@ void RowPainter::paintOnlyInsets()
        for ( ; cit != end ; ++cit) {
                Row::Element const & e = *cit;
                if (e.type == Row::INSET) {
-                       // If outer row has changed, nested insets are repainted completely.
-                       // FIXME: check what this really does. The test is weird.
-                       bool const nested_inset =
-                               (e.inset->asInsetMath() && !e.inset->asInsetMath()->asMacroTemplate())
-                               || e.inset->asInsetText() || e.inset->asInsetTabular();
-                       if (nested_inset)
-                               paintInset(e);
+                       paintInset(e);
+                       // The line that indicates word in a different language
+                       paintForeignMark(e);
+                       // change tracking (not for insets that handle it themselves)
+                       if (!e.inset->canPaintChange(*pi_.base.bv))
+                               paintChange(e);
                }
+
                x_ += e.full_width();
        }
 }
@@ -611,8 +595,8 @@ void RowPainter::paintText()
                // The line that indicates word in a different language
                paintForeignMark(e);
 
-               // change tracking (not for insets that track their own changes)
-               if (e.type != Row::INSET || ! e.inset->canTrackChanges())
+               // change tracking (not for insets that handle it themselves)
+               if (e.type != Row::INSET || ! e.inset->canPaintChange(*pi_.base.bv))
                        paintChange(e);
 
                x_ += e.full_width();
@@ -626,11 +610,11 @@ void RowPainter::paintSelection() const
                return;
        Cursor const & curs = pi_.base.bv->cursor();
        DocIterator beg = curs.selectionBegin();
-       beg.pit() = pit_;
+       beg.pit() = row_.pit();
        beg.pos() = row_.sel_beg;
 
        DocIterator end = curs.selectionEnd();
-       end.pit() = pit_;
+       end.pit() = row_.pit();
        end.pos() = row_.sel_end;
 
        bool const begin_boundary = beg.pos() >= row_.endpos();