ctests: fix/update CJK tests.

[lyx.git] / src / RowPainter.cpp

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 43b3be20ce67c35766183f5e647cd2fffc1ec625..e547888cf9bd7b82ffb5daec3451aa248e785843 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -432,7 +432,7 @@ void RowPainter::paintLabel() const
        double x = x_;
 
        if (row_.isRTL())
-               x = tm_.width() - row_.right_margin + fm.width(layout.labelsep);
+               x = xo_ + row_.width() + fm.width(layout.labelsep);
        else
                x = x_ - fm.width(layout.labelsep) - fm.width(str);
 
@@ -467,10 +467,10 @@ void RowPainter::paintTopLevelLabel() const
 
        double x = x_;
        if (layout.labeltype == LABEL_CENTERED) {
-               x = row_.left_margin + (tm_.width() - row_.left_margin - row_.right_margin) / 2;
+               x += (tm_.width() - row_.left_margin - row_.right_margin) / 2;
                x -= fm.width(str) / 2;
        } else if (row_.isRTL()) {
-               x = tm_.width() - row_.right_margin - fm.width(str);
+               x = xo_ + tm_.width() - row_.right_margin - fm.width(str);
        }
        pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
 }
@@ -557,9 +557,9 @@ void RowPainter::paintLast() const
                }
 
                if (endlabel == END_LABEL_BOX)
-                       pi_.pain.rectangle(x, y, size, size, font.realColor());
+                       pi_.pain.rectangle(xo_ + x, y, size, size, font.realColor());
                else
-                       pi_.pain.fillRectangle(x, y, size, size, font.realColor());
+                       pi_.pain.fillRectangle(xo_ + x, y, size, size, font.realColor());
                break;
        }
 
@@ -580,10 +580,7 @@ void RowPainter::paintLast() const
 
 void RowPainter::paintOnlyInsets()
 {
-       Row::const_iterator cit = row_.begin();
-       Row::const_iterator const & end = row_.end();
-       for ( ; cit != end ; ++cit) {
-               Row::Element const & e = *cit;
+       for (Row::Element const & e : row_) {
                if (e.type == Row::INSET) {
                        paintInset(e);
                        // The markings of foreign languages
@@ -601,11 +598,7 @@ void RowPainter::paintOnlyInsets()
 
 void RowPainter::paintText()
 {
-       Row::const_iterator cit = row_.begin();
-       Row::const_iterator const & end = row_.end();
-       for ( ; cit != end ; ++cit) {
-               Row::Element const & e = *cit;
-
+       for (Row::Element const & e : row_) {
                switch (e.type) {
                case Row::STRING:
                case Row::VIRTUAL: