* There are cases where updateLabels is not called because no

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 653c9d12769df04d4ef9bdb783ad3df8285d3883..60e6ab22a21ea8084c6d81c55fd8942bcf765574 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -46,10 +46,7 @@
 
 #include <ostream>
 
-using std::endl;
-using std::max;
-using std::string;
-
+using namespace std;
 
 namespace lyx {
 
@@ -99,6 +96,10 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
        Font const font = text_metrics_.getDisplayFont(pit_, pos);
 
        BOOST_ASSERT(inset);
+       // Backup full_repaint status because some insets (InsetTabular)
+       // requires a full repaint
+       bool pi_full_repaint = pi_.full_repaint;
+
        // FIXME: We should always use font, see documentation of
        // noFontChange() in Inset.h.
        pi_.base.font = inset->noFontChange() ?
@@ -117,6 +118,9 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 
        x_ += dim.width();
 
+       // Restore full_repaint status.
+       pi_.full_repaint = pi_full_repaint;
+
 #ifdef DEBUG_METRICS
        int const x1 = int(x_ - dim.width());
        Dimension dim2;
@@ -128,15 +132,15 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
        if (dim.wid != dim2.wid)
                lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
                       << " draw width " << dim.width()
-                      << "> metrics width " << dim2.wid << "." << std::endl;
+                      << "> metrics width " << dim2.wid << "." << endl;
        if (dim->asc != dim2.asc)
                lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
                       << " draw ascent " << dim.ascent()
-                      << "> metrics ascent " << dim2.asc << "." << std::endl;
+                      << "> metrics ascent " << dim2.asc << "." << endl;
        if (dim2.descent() != dim.des)
                lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
                       << " draw ascent " << dim.descent()
-                      << "> metrics descent " << dim2.des << "." << std::endl;
+                      << "> metrics descent " << dim2.des << "." << endl;
        BOOST_ASSERT(dim2.wid == dim.wid);
        BOOST_ASSERT(dim2.asc == dim.asc);
        BOOST_ASSERT(dim2.des == dim.des);
@@ -225,7 +229,7 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
        Change::Type const prev_change = par_.lookupChange(pos).type;
 
        // first character
-       std::vector<char_type> str;
+       vector<char_type> str;
        str.reserve(100);
        str.push_back(par_.getChar(pos));
 
@@ -332,7 +336,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
        char_type const c = par_.getChar(pos);
 
        // special case languages
-       std::string const & lang = orig_font.language()->lang();
+       string const & lang = orig_font.language()->lang();
        bool const hebrew = lang == "hebrew";
        bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" || 
                                                lang == "farsi";
@@ -490,7 +494,7 @@ void RowPainter::paintFirst()
 
        bool const is_rtl = text_.isRTL(buffer, par_);
        bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
-       //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
+       //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
 
        // should we print a label?
        if (layout->labeltype >= LABEL_STATIC
@@ -606,10 +610,14 @@ void RowPainter::paintLast()
                FontMetrics const & fm = theFontMetrics(font);
                int const size = int(0.75 * fm.maxAscent());
                int const y = yo_ - size;
-               int x = is_rtl ? nestMargin() + changebarMargin() : width_ - size;
-
-               if (width_ - int(row_.width()) <= size)
-                       x += (size - width_ + row_.width() + 1) * (is_rtl ? -1 : 1);
+               int const max_row_width = width_ - size - Inset::TEXT_TO_INSET_OFFSET;
+               int x = is_rtl ? nestMargin() + changebarMargin()
+                       : max_row_width - text_metrics_.rightMargin(pm_);
+
+               // 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;
 
                if (endlabel == END_LABEL_BOX)
                        pi_.pain.rectangle(x, y, size, size, Color_eolmarker);