#include "Cursor.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "Bullet.h"
#include "Changes.h"
#include "Language.h"
#include "Layout.h"
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_
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);
}
for (depth_type i = 1; i <= depth; ++i) {
int const w = nestMargin() / 5;
int x = int(xo_) + w * i;
- // consider the bufferview left margin if we're drawing outermost text
+ // only consider the changebar space if we're drawing outermost text
if (text_.isMainText())
- x += pi_.base.bv->leftMargin();
+ x += pi_.base.bv->leftMargin() - changebarMargin();
int const starty = yo_ - row_.ascent();
int const h = row_.height() - 1 - (i - next_depth - 1) * 3;
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);
}
}
if (str.empty())
return;
+ // different font for label separation and string
Layout const & layout = par_.layout();
FontInfo const font = labelFont(false);
FontMetrics const & fm = theFontMetrics(font);
+ FontInfo lfont = font;
+
+ // bullet?
+ if (layout.labeltype == LABEL_ITEMIZE && par_.itemdepth < 4) {
+ // get label font size from document properties
+ lfont.setSize(pi_.base.bv->buffer().params().user_defined_bullet(par_.itemdepth).getFontSize());
+ // realize to avoid assertion
+ lfont.realize(sane_font);
+ }
+
+ FontMetrics const & lfm = theFontMetrics(lfont);
+
int const x = row_.isRTL() ? row_.width() + fm.width(layout.labelsep)
- : row_.left_margin - fm.width(layout.labelsep) - fm.width(str);
+ : row_.left_margin - fm.width(layout.labelsep) - lfm.width(str);
- pi_.pain.text(int(xo_) + x, yo_, str, font);
+ pi_.pain.text(int(xo_) + x, yo_, str, lfont);
}
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()) {
break;
case Row::SPACE:
+ case Row::MARGINSPACE:
paintTextDecoration(e);
}
if (!row_.selection())
return;
- 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);
+ 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);
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);
}
projects / lyx.git / blobdiff