#include "support/convert.h"
#include "support/debug.h"
#include "support/lassert.h"
+#include "support/lyxlib.h"
+#include "support/RefChanger.h"
#include <stdlib.h>
#include <cmath>
// << " maxWidth: " << max_width_ << "\nfont: " << mi.base.font << endl;
bool changed = false;
- unsigned int h = 0;
+ int h = 0;
for (pit_type pit = 0; pit != npar; ++pit) {
// create rows, but do not set alignment yet
changed |= redoParagraph(pit, false);
do {
if (row_index == pm.rows().size())
pm.rows().push_back(Row());
+ else
+ pm.rows()[row_index] = Row();
Row & row = pm.rows()[row_index];
row.pit(pit);
row.pos(first);
- row.pit(pit);
need_new_row = breakRow(row, right_margin);
setRowHeight(row);
row.changed(true);
LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const
{
- LyXAlignment align = par.getAlign();
+ LyXAlignment align = par.getAlign(bv_->buffer().params());
// handle alignment inside tabular cells
Inset const & owner = text_->inset();
*/
bool TextMetrics::breakRow(Row & row, int const right_margin) const
{
+ LATTEST(row.empty());
Paragraph const & par = text_->getPar(row.pit());
pos_type const end = par.size();
pos_type const pos = row.pos();
bool const is_rtl = text_->isRTL(row.pit());
bool need_new_row = false;
- row.clear();
row.left_margin = leftMargin(row.pit(), pos);
row.right_margin = right_margin;
if (is_rtl)
if (!par.params().leftIndent().zero())
l_margin += par.params().leftIndent().inPixels(max_width_, lfm.em());
- LyXAlignment align = par.getAlign();
+ LyXAlignment align = par.getAlign(bv_->buffer().params());
// set the correct parindent
if (pos == 0
if (pm.rows().empty())
return;
size_t const nrows = pm.rows().size();
+ // Remember left and right margin for drawing math numbers
+ Changer changeleft = make_change(pi.leftx, x + leftMargin(pit));
+ Changer changeright = make_change(pi.rightx, x + width() - rightMargin(pit));
// Use fast lane in nodraw stage.
if (pi.pain.isNull()) {
}
}
+ if (text_->isRTL(pit))
+ swap(pi.leftx, pi.rightx);
+
for (size_t i = 0; i != nrows; ++i) {
Row const & row = pm.rows()[i];
LYXERR(Debug::PAINTING, "Clear rect@("
<< max(row_x, 0) << ", " << y - row.ascent() << ")="
<< width() << " x " << row.height());
- // FIXME: this is a hack. We know that at least this
- // amount of pixels can be cleared on right and left.
- // Doing so gets rid of caret ghosts when the cursor is at
- // the begining/end of row. However, it will not work if
- // the caret has a ridiculous width like 6. (see ticket
- // #10797)
- pi.pain.fillRectangle(max(row_x, 0) - Inset::TEXT_TO_INSET_OFFSET,
- y - row.ascent(),
- width() + 2 * Inset::TEXT_TO_INSET_OFFSET,
+ // FIXME: this is a hack. We clear an amount equal to
+ // cursor width. This will not work if the caret has a
+ // ridiculous width like 6. (see ticket #10797)
+ // This is the same formula as in GuiWorkArea.
+ int const caret_width = lyxrc.cursor_width
+ ? lyxrc.cursor_width
+ : 1 + int((lyxrc.currentZoom + 50) / 200.0);
+ pi.pain.fillRectangle(max(row_x, 0), y - row.ascent(),
+ width() + caret_width,
row.height(), pi.background_color);
}
static int count = 0;
++count;
FontInfo fi(sane_font);
- fi.setSize(FONT_SIZE_TINY);
+ fi.setSize(TINY_SIZE);
fi.setColor(Color_red);
pi.pain.text(row_x, y, convert<docstring>(count), fi);
#endif