#include "Cursor.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "Bullet.h"
#include "Changes.h"
#include "Language.h"
#include "Layout.h"
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;
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) {
+ // 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);
}
break;
case Row::SPACE:
+ case Row::MARGINSPACE:
paintTextDecoration(e);
- break;
-
- case Row::INVALID:
- LYXERR0("Trying to paint INVALID row element.");
}
// The markings of foreign languages
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);
}