Change label "Show Zoom" to "Show Zoom Value"

[features.git] / src / RowPainter.cpp

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index e378f433e8ebc6d09b8d3c3012f9fd861d365dc4..b7b479babd64db8487da2cf4a05acf2f0f350304 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -82,7 +82,11 @@ FontInfo RowPainter::labelFont(bool end) const
 
 void RowPainter::paintInset(Row::Element const & e) const
 {
-       // Handle selection
+       // Handle selection (first left/right, then middle).
+       pi_.selected_left = pi_.selected
+                           || (row_.isRTL() ? row_.end_margin_sel : row_.begin_margin_sel);
+       pi_.selected_right = pi_.selected
+                            || (row_.isRTL() ? row_.begin_margin_sel : row_.end_margin_sel);
        bool const pi_selected = pi_.selected;
        Cursor const & cur = pi_.base.bv->cursor();
        if (cur.selection() && cur.text() == &text_
@@ -289,7 +293,10 @@ void RowPainter::paintChange(Row::Element const & e) const
 
 void RowPainter::paintChangeBar() const
 {
-       pi_.pain.fillRectangle(5, yo_ - row_.ascent(), 3, row_.height(), Color_changebar);
+       int const x = pi_.base.bv->leftMargin() - pi_.base.bv->zoomedPixels(7);
+       Dimension const & cdim = row_.contents_dim();
+       pi_.pain.fillRectangle(x, yo_ - cdim.ascent(),
+                              3, cdim.height(), Color_changebar);
 }
 
 
@@ -378,18 +385,17 @@ void RowPainter::paintAppendixStart(int y) const
 
 void RowPainter::paintTooLargeMarks(bool const left, bool const right) const
 {
-       if (left)
-               pi_.pain.line(pi_.base.dottedLineThickness(), yo_ - row_.ascent(),
-                                         pi_.base.dottedLineThickness(), yo_ + row_.descent(),
-                                         Color_scroll, Painter::line_onoffdash,
-                             pi_.base.dottedLineThickness());
+       int const lwid = pi_.base.dottedLineThickness();
+       Dimension const & cdim = row_.contents_dim();
+       if (left) {
+               int const x = pi_.base.bv->leftMargin() - lwid;
+               pi_.pain.line(x, yo_ - cdim.ascent(), x, yo_ + cdim.descent(),
+                             Color_scroll, Painter::line_onoffdash, lwid);
+       }
        if (right) {
-               int const wwidth =
-                       pi_.base.bv->workWidth() - pi_.base.dottedLineThickness();
-               pi_.pain.line(wwidth, yo_ - row_.ascent(),
-                                         wwidth, yo_ + row_.descent(),
-                                         Color_scroll, Painter::line_onoffdash,
-                             pi_.base.dottedLineThickness());
+               int const x = pi_.base.bv->workWidth() - pi_.base.bv->rightMargin();
+               pi_.pain.line(x, yo_ - cdim.ascent(), x, yo_ + cdim.descent(),
+                             Color_scroll, Painter::line_onoffdash, lwid);
        }
 }
 
@@ -457,14 +463,16 @@ void RowPainter::paintTopLevelLabel() const
 
        double x = x_;
        if (layout.labeltype == LABEL_CENTERED) {
+               // 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.
                 */
-               int const leftm = row_.isRTL() ? tm_.rightMargin(row_.pit())
-                                              : tm_.leftMargin(row_.pit());
-               int const rightm = row_.isRTL() ? tm_.leftMargin(row_.pit())
-                                                   : tm_.rightMargin(row_.pit());
                x += leftm - row_.left_margin + (tm_.width() - leftm -rightm) / 2
                        - fm.width(str) / 2;
        } else if (row_.isRTL()) {
@@ -509,8 +517,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;
        }
 
@@ -577,10 +585,16 @@ 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_.contents_dim().asc;
+       int const y2 = yo_ + row_.contents_dim().des;
+
+       // The top selection
+       if (row_.begin_margin_sel)
+               pi_.pain.fillRectangle(int(xo_), yo_ - row_.ascent(),
+                                      tm_.width(), row_.ascent() - row_.contents_dim().asc,
+                                      Color_selection);
 
-       // draw the margins
+       // The left margin selection
        if (row_.isRTL() ? row_.end_margin_sel : row_.begin_margin_sel)
                pi_.pain.fillRectangle(int(xo_), y1, row_.left_margin, y2 - y1,
                                       Color_selection);
@@ -619,11 +633,31 @@ void RowPainter::paintSelection() const
                x += e.full_width();
        }
 
+       // the right margin selection
        if (row_.isRTL() ? row_.begin_margin_sel : row_.end_margin_sel)
                pi_.pain.fillRectangle(int(x), y1,
                                       int(xo_ + tm_.width()) - int(x), y2 - y1,
                                       Color_selection);
+       // The bottom selection
+       if (row_.end_margin_sel)
+               pi_.pain.fillRectangle(int(xo_), yo_ + row_.contents_dim().des,
+                                      tm_.width(), row_.descent() - row_.contents_dim().des,
+                                      Color_selection);
+}
+
 
+void RowPainter::paintBookmark(int num) const
+{
+       BufferView const * bv = pi_.base.bv;
+       FontInfo fi = bv->buffer().params().getFont().fontInfo();
+       FontMetrics const & fm = theFontMetrics(fi);
+       fi.setColor(Color_bookmark);
+       // ❶ U+2776 DINGBAT NEGATIVE CIRCLED DIGIT ONE
+       char_type const ch = 0x2775 + num;
+       int const x = row_.isRTL()
+               ? bv->workWidth() - bv->rightMargin() + (bv->defaultMargin() - fm.width(ch)) / 2
+               : bv->leftMargin() - (bv->defaultMargin() + fm.width(ch)) / 2;
+       pi_.pain.text(x, yo_, ch, fi);
 }