Copy modules into the Advanced F&R pane as well.

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index cc78cff3390f8e3579164155f98f90b0174b4d07..3fb87bd7e1f3b80504742a85654fa361aca2c4b0 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -95,7 +95,7 @@ double Row::Element::pos2x(pos_type const i) const
 }
 
 
-pos_type Row::Element::x2pos(int &x, bool const select) const
+pos_type Row::Element::x2pos(int &x) const
 {
        //lyxerr << "x2pos: x=" << x << " w=" << width() << " " << *this;
        size_t i = 0;
@@ -112,11 +112,10 @@ pos_type Row::Element::x2pos(int &x, bool const select) const
                x = isRTL() ? int(full_width()) : 0;
                break;
        case INSET:
-       case SPACE: {
-               int const boundary = select ? (full_width() + 1) / 2 : full_width();
+       case SPACE:
                // those elements contain only one position. Round to
                // the closest side.
-               if (x > boundary) {
+               if (x > (full_width() + 1) / 2) {
                        x = int(full_width());
                        i = !isRTL();
                } else {
@@ -124,7 +123,6 @@ pos_type Row::Element::x2pos(int &x, bool const select) const
                        i = isRTL();
                }
        }
-       }
        //lyxerr << "=> p=" << pos + i << " x=" << x << endl;
        return pos + i;
 }
@@ -164,19 +162,13 @@ Row::Row()
        : separator(0), label_hfill(0), left_margin(0), right_margin(0),
          sel_beg(-1), sel_end(-1),
          begin_margin_sel(false), end_margin_sel(false),
-         changed_(false), crc_(0),
+         changed_(true),
          pit_(0), pos_(0), end_(0),
-         right_boundary_(false), flushed_(false), rtl_(false)
+         right_boundary_(false), flushed_(false), rtl_(false),
+         changebar_(false)
 {}
 
 
-void Row::setCrc(size_type crc) const
-{
-       changed_ = crc != crc_;
-       crc_ = crc;
-}
-
-
 bool Row::isMarginSelected(bool left_margin, DocIterator const & beg,
                DocIterator const & end) const
 {
@@ -211,8 +203,8 @@ void Row::setSelectionAndMargins(DocIterator const & beg,
        setSelection(beg.pos(), end.pos());
 
        if (selection()) {
-               end_margin_sel = isMarginSelected(false, beg, end);
-               begin_margin_sel = isMarginSelected(true, beg, end);
+               change(end_margin_sel, isMarginSelected(false, beg, end));
+               change(begin_margin_sel, isMarginSelected(true, beg, end));
        }
 }
 
@@ -220,18 +212,18 @@ void Row::setSelectionAndMargins(DocIterator const & beg,
 void Row::setSelection(pos_type beg, pos_type end) const
 {
        if (pos_ >= beg && pos_ <= end)
-               sel_beg = pos_;
+               change(sel_beg, pos_);
        else if (beg > pos_ && beg <= end_)
-               sel_beg = beg;
+               change(sel_beg, beg);
        else
-               sel_beg = -1;
+               change(sel_beg, -1);
 
        if (end_ >= beg && end_ <= end)
-               sel_end = end_;
+               change(sel_end,end_);
        else if (end < end_ && end >= pos_)
-               sel_end = end;
+               change(sel_end, end);
        else
-               sel_end = -1;
+               change(sel_end, -1);
 }
 
 
@@ -277,7 +269,7 @@ ostream & operator<<(ostream & os, Row const & row)
           << " ascent: " << row.dim_.asc
           << " descent: " << row.dim_.des
           << " separator: " << row.separator
-          << " label_hfill: " << row.label_hfill 
+          << " label_hfill: " << row.label_hfill
           << " row_boundary: " << row.right_boundary() << "\n";
        double x = row.left_margin;
        Row::Elements::const_iterator it = row.elements_.begin();
@@ -373,6 +365,8 @@ void Row::finalizeLast()
        if (elt.final)
                return;
        elt.final = true;
+       if (elt.change.changed())
+               changebar_ = true;
 
        if (elt.type == STRING) {
                dim_.wid -= elt.dim.wid;