GuiCharacter: Consider default settings for underline, strikeout and language

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index ad492c1a7a53fcd2554b436ffadc5109e82011d1..697e526094b7f399801f4d62d24f7b39f5fc503a 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -169,31 +169,30 @@ Row::Row()
 {}
 
 
-bool Row::isMarginSelected(bool left_margin, DocIterator const & beg,
+bool Row::isMarginSelected(bool left, DocIterator const & beg,
                DocIterator const & end) const
 {
-       pos_type const sel_pos = left_margin ? sel_beg : sel_end;
-       pos_type const margin_pos = left_margin ? pos_ : end_;
-
-       // Is the chosen margin selected ?
-       if (sel_pos == margin_pos) {
-               if (beg.pos() == end.pos())
-                       // This is a special case in which the space between after
-                       // pos i-1 and before pos i is selected, i.e. the margins
-                       // (see DocIterator::boundary_).
-                       return beg.boundary() && !end.boundary();
-               else if (end.pos() == margin_pos)
-                       // If the selection ends around the margin, it is only
-                       // drawn if the cursor is after the margin.
-                       return !end.boundary();
-               else if (beg.pos() == margin_pos)
-                       // If the selection begins around the margin, it is
-                       // only drawn if the cursor is before the margin.
-                       return beg.boundary();
-               else
-                       return true;
-       }
-       return false;
+       pos_type const sel_pos = left ? sel_beg : sel_end;
+       pos_type const margin_pos = left ? pos_ : end_;
+
+       // Is there a selection and is the chosen margin selected ?
+       if (!selection() || sel_pos != margin_pos)
+               return false;
+       else if (beg.pos() == end.pos())
+               // This is a special case in which the space between after
+               // pos i-1 and before pos i is selected, i.e. the margins
+               // (see DocIterator::boundary_).
+               return beg.boundary() && !end.boundary();
+       else if (end.pos() == margin_pos)
+               // If the selection ends around the margin, it is only
+               // drawn if the cursor is after the margin.
+               return !end.boundary();
+       else if (beg.pos() == margin_pos)
+               // If the selection begins around the margin, it is
+               // only drawn if the cursor is before the margin.
+               return beg.boundary();
+       else
+               return true;
 }
 
 
@@ -202,28 +201,35 @@ 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));
+}
+
+
+void Row::clearSelectionAndMargins() const
+{
+       change(sel_beg, -1);
+       change(sel_end, -1);
+       change(end_margin_sel, false);
+       change(begin_margin_sel, false);
 }
 
 
 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);
 }