grammar

[lyx.git] / src / RowPainter.cpp

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 6e4cf31ac10eed23dd7016d30067091ec4fd27b1..8cc7202ccc51ca67db5693684fbfb516e0a67cf6 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -11,8 +11,6 @@
 
 #include <config.h>
 
-#include <algorithm>
-
 #include "RowPainter.h"
 
 #include "Buffer.h"
@@ -39,6 +37,7 @@
 #include "support/gettext.h"
 #include "support/lassert.h"
 
+#include <algorithm>
 
 using namespace std;
 
@@ -458,8 +457,18 @@ void RowPainter::paintTopLevelLabel() const
 
        double x = x_;
        if (layout.labeltype == LABEL_CENTERED) {
-               x += (tm_.width() - row_.left_margin - row_.right_margin) / 2;
-               x -= fm.width(str) / 2;
+               // The 'size + 1' is weird, but it makes sure that we get the
+               // left margin of non-first row.
+               int leftm = tm_.leftMargin(row_.pit(), par_.size() + 1);
+               int rightm = tm_.rightMargin(row_.pit());
+               if (row_.isRTL())
+                       swap(leftm, rightm);
+               /* Currently, x points at row_.left_margin (which contains the
+                * indent). First remove that, and then center the title with
+                * respect to the left and right margins.
+                */
+               x += leftm - row_.left_margin + (tm_.width() - leftm -rightm) / 2
+                       - fm.width(str) / 2;
        } else if (row_.isRTL()) {
                x = xo_ + tm_.width() - row_.right_margin - fm.width(str);
        }
@@ -502,8 +511,8 @@ void RowPainter::paintLast() const
                FontInfo const font = labelFont(true);
                FontMetrics const & fm = theFontMetrics(font);
                docstring const & str = par_.layout().endlabelstring();
-               double const x = row_.isRTL() ? x_ - fm.width(str) : x_;
-               pi_.pain.text(int(x), yo_, str, font);
+               double const x = row_.isRTL() ? row_.left_margin - fm.width(str) : row_.width();
+               pi_.pain.text(xo_ + x, yo_, str, font);
                break;
        }
 
@@ -570,8 +579,10 @@ void RowPainter::paintSelection() const
        if (!row_.selection())
                return;
 
-       int const y1 = yo_ - row_.ascent();
-       int const y2 = y1 + row_.height();
+       int const y1 = yo_ - (row_.begin_margin_sel ? row_.ascent()
+                                                   : row_.contents_dim().asc);
+       int const y2 = yo_ + (row_.end_margin_sel ? row_.descent()
+                                                 : row_.contents_dim().des);
 
        // draw the margins
        if (row_.isRTL() ? row_.end_margin_sel : row_.begin_margin_sel)
@@ -616,7 +627,18 @@ void RowPainter::paintSelection() const
                pi_.pain.fillRectangle(int(x), y1,
                                       int(xo_ + tm_.width()) - int(x), y2 - y1,
                                       Color_selection);
+}
+
 
+void RowPainter::paintBookmark(int num) const
+{
+       int const x = row_.isRTL()
+               ? pi_.base.bv->workWidth() - pi_.base.bv->rightMargin() : 0;
+       FontInfo fi = pi_.base.bv->buffer().params().getFont().fontInfo();
+       fi.setColor(Color_bookmark);
+       // ❶ U+2776 DINGBAT NEGATIVE CIRCLED DIGIT ONE
+       char_type const ch = 0x2775 + num;
+       pi_.pain.text(x, yo_, ch, fi);
 }