#include "Cursor.h"
#include "CutAndPaste.h"
#include "FuncRequest.h"
+#include "HSpace.h"
#include "InsetList.h"
#include "Layout.h"
#include "Length.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
-#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "rowpainter.h"
#include "Text.h"
#include "TextClass.h"
#include "VSpace.h"
+#include "WordLangTuple.h"
+
+#include "insets/InsetText.h"
#include "mathed/MacroTable.h"
#include "mathed/MathMacroTemplate.h"
#include "frontends/Painter.h"
#include "support/debug.h"
-#include <cstdlib>
+#include "support/docstring_list.h"
#include "support/lassert.h"
+#include <cstdlib>
+
using namespace std;
bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
{
- LASSERT(mi.base.textwidth, /**/);
+ LASSERT(mi.base.textwidth > 0, /**/);
max_width_ = mi.base.textwidth;
// backup old dimension.
Dimension const old_dim = dim_;
{
Font lf(font_);
lf.fontInfo().reduce(bv_->buffer().params().getFont().fontInfo());
- lf.fontInfo().realize(font.fontInfo());
- lf.setLanguage(font.language());
- font = lf;
+ Font tmp(font);
+ tmp.fontInfo().realize(lf.fontInfo());
+ font = tmp;
}
// We specialize the 95% common case:
if (!par.getDepth()) {
Font f = par.getFontSettings(params, pos);
- if (!text_->isMainText(buffer))
+ if (!text_->isMainText())
applyOuterFont(f);
bool lab = layout.labeltype == LABEL_MANUAL && pos < body_pos;
Font font = par.getFontSettings(params, pos);
font.fontInfo().realize(layoutfont);
- if (!text_->isMainText(buffer))
+ if (!text_->isMainText())
applyOuterFont(font);
// Realize against environment font information
// NOTE: the cast to pit_type should be removed when pit_type
// changes to a unsigned integer.
if (pit < pit_type(pars.size()))
- font.fontInfo().realize(outerFont(pit, pars).fontInfo());
+ font.fontInfo().realize(text_->outerFont(pit).fontInfo());
// Realize with the fonts of lesser depth.
font.fontInfo().realize(params.getFont().fontInfo());
if (!lyxrc.rtl_support)
return false;
- // no RTL boundary at line start
+ // no RTL boundary at paragraph start
if (pos == 0)
return false;
if (!lyxrc.rtl_support)
return false;
+ // no RTL boundary at paragraph start
+ if (pos == 0)
+ return false;
+
+ ParagraphMetrics & pm = par_metrics_[pit];
+ // no RTL boundary in empty paragraph
+ if (pm.rows().empty())
+ return false;
+
+ pos_type endpos = pm.getRow(pos - 1, false).endpos();
+ pos_type startpos = pm.getRow(pos, false).pos();
+ // no RTL boundary at line start:
+ // abc\n -> toggle to RTL -> abc\n (and not: abc\n|
+ // | | )
+ if (pos == startpos && pos == endpos) // start of cur row, end of prev row
+ return false;
+
Paragraph const & par = text_->getPar(pit);
bool left = font.isVisibleRightToLeft();
bool right;
right = par.isRTL(bv_->buffer().params());
else
right = displayFont(pit, pos).isVisibleRightToLeft();
+
+ // no RTL boundary at line break:
+ // abc|\n -> move right -> abc\n (and not: abc\n|
+ // FED FED| FED )
+ if (startpos == pos && endpos == pos && endpos != par.size()
+ && (par.isNewline(pos - 1)
+ || par.isLineSeparator(pos - 1)
+ || par.isSeparator(pos - 1)))
+ return false;
+
return left != right;
}
- right_margin;
Font const & font = ii->inset->noFontChange() ?
bufferfont : displayFont(pit, ii->pos);
- MacroContext mc(buffer, parPos);
+ MacroContext mc(&buffer, parPos);
MetricsInfo mi(bv_, font.fontInfo(), w, mc);
ii->inset->metrics(mi, dim);
Dimension const old_dim = pm.insetDimension(ii->inset);
row.label_hfill = 0;
row.separator = 0;
- Buffer & buffer = bv_->buffer();
Paragraph const & par = text_->getPar(pit);
double w = width - row.width();
//lyxerr << "row.width() " << row.width() << endl;
//lyxerr << "w " << w << endl;
- bool const is_rtl = text_->isRTL(buffer, par);
+ bool const is_rtl = text_->isRTL(par);
if (is_rtl)
row.x = rightMargin(pit);
else
align = par.params().align();
// handle alignment inside tabular cells
- Inset const & owner = par.inInset();
+ Inset const & owner = text_->inset();
switch (owner.contentAlignment()) {
case LYX_ALIGN_CENTER:
case LYX_ALIGN_LEFT:
break;
}
- // Display-style insets should always be on a centred row
+ // Display-style insets should always be on a centered row
if (Inset const * inset = par.getInset(row.pos())) {
switch (inset->display()) {
case Inset::AlignLeft:
align = LYX_ALIGN_CENTER;
break;
case Inset::Inline:
- case Inset::AlignRight:
// unchanged (use align)
break;
+ case Inset::AlignRight:
+ align = LYX_ALIGN_RIGHT;
+ break;
}
}
if (body_pos > 0
&& (body_pos > end || !par.isLineSeparator(body_pos - 1)))
{
- row.x += theFontMetrics(text_->labelFont(buffer, par)).
+ row.x += theFontMetrics(text_->labelFont(par)).
width(layout.labelsep);
if (body_pos <= end)
row.x += row.label_hfill;
int TextMetrics::labelFill(pit_type const pit, Row const & row) const
{
- Buffer & buffer = bv_->buffer();
Paragraph const & par = text_->getPar(pit);
pos_type last = par.beginOfBody();
return 0;
FontMetrics const & fm
- = theFontMetrics(text_->labelFont(buffer, par));
+ = theFontMetrics(text_->labelFont(par));
return max(0, fm.width(label) - w);
}
} // anon namespace
-pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
- pit_type pos) const
+pos_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
+ pos_type pos) const
{
- Buffer & buffer = bv_->buffer();
ParagraphMetrics const & pm = par_metrics_[pit];
Paragraph const & par = text_->getPar(pit);
pos_type const end = par.size();
// pixel width since last breakpoint
int chunkwidth = 0;
+ docstring const s(1, char_type(0x00B6));
+ Font f;
+ int par_marker_width = theFontMetrics(f).width(s);
+
FontIterator fi = FontIterator(*this, par, pit, pos);
pos_type point = end;
pos_type i = pos;
+
+ ParagraphList const & pars_ = text_->paragraphs();
+ bool const draw_par_end_marker = lyxrc.paragraph_markers
+ && size_type(pit + 1) < pars_.size();
+
for ( ; i < end; ++i, ++fi) {
int thiswidth = pm.singleWidth(i, *fi);
+
+ if (draw_par_end_marker && i == end - 1)
+ // enlarge the last character to hold the end-of-par marker
+ thiswidth += par_marker_width;
// add inline completion width
if (inlineCompletionLPos == i) {
// add the auto-hfill from label end to the body
if (body_pos && i == body_pos) {
FontMetrics const & fm = theFontMetrics(
- text_->labelFont(buffer, par));
+ text_->labelFont(par));
int add = fm.width(layout.labelsep);
if (par.isLineSeparator(i - 1))
add -= singleWidth(pit, i - 1);
int TextMetrics::rowWidth(int right_margin, pit_type const pit,
pos_type const first, pos_type const end) const
{
- Buffer & buffer = bv_->buffer();
// get the pure distance
ParagraphMetrics const & pm = par_metrics_[pit];
Paragraph const & par = text_->getPar(pit);
for ( ; i < end; ++i, ++fi) {
if (body_pos > 0 && i == body_pos) {
FontMetrics const & fm = theFontMetrics(
- text_->labelFont(buffer, par));
+ text_->labelFont(par));
w += fm.width(par.layout().labelsep);
if (par.isLineSeparator(i - 1))
w -= singleWidth(pit, i - 1);
w = max(w, label_end);
}
- w += pm.singleWidth(i, *fi);
+
+ // a line separator at the end of a line (but not at the end of a
+ // paragraph) will not be drawn and should therefore not count for
+ // the row width.
+ if (!par.isLineSeparator(i) || i != end - 1 || end == par.size())
+ w += pm.singleWidth(i, *fi);
// add inline completion width
if (inlineCompletionLPos == i) {
}
}
+ // count the paragraph end marker.
+ if (end == par.size() && lyxrc.paragraph_markers) {
+ ParagraphList const & pars_ = text_->paragraphs();
+ if (size_type(pit + 1) < pars_.size()) {
+ // enlarge the last character to hold the
+ // end-of-par marker
+ docstring const s(1, char_type(0x00B6));
+ Font f;
+ w += theFontMetrics(f).width(s);
+ }
+ }
+
if (body_pos > 0 && body_pos >= end) {
FontMetrics const & fm = theFontMetrics(
- text_->labelFont(buffer, par));
+ text_->labelFont(par));
w += fm.width(par.layout().labelsep);
if (end > 0 && par.isLineSeparator(end - 1))
w -= singleWidth(pit, end - 1);
Buffer const & buffer = bv_->buffer();
Font font = displayFont(pit, first);
FontSize const tmpsize = font.fontInfo().size();
- font.fontInfo() = text_->layoutFont(buffer, pit);
+ font.fontInfo() = text_->layoutFont(pit);
FontSize const size = font.fontInfo().size();
font.fontInfo().setSize(tmpsize);
- FontInfo labelfont = text_->labelFont(buffer, par);
+ FontInfo labelfont = text_->labelFont(par);
FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
FontMetrics const & fontmetrics = theFontMetrics(font);
// these are minimum values
double const spacing_val = layout.spacing.getValue()
- * text_->spacing(buffer, par);
+ * text_->spacing(par);
//lyxerr << "spacing_val = " << spacing_val << endl;
int maxasc = int(fontmetrics.maxAscent() * spacing_val);
int maxdesc = int(fontmetrics.maxDescent() * spacing_val);
InsetList::const_iterator ii = par.insetList().begin();
InsetList::const_iterator iend = par.insetList().end();
for ( ; ii != iend; ++ii) {
- Dimension const & dim = pm.insetDimension(ii->inset);
if (ii->pos >= first && ii->pos < end) {
+ Dimension const & dim = pm.insetDimension(ii->inset);
maxasc = max(maxasc, dim.ascent());
maxdesc = max(maxdesc, dim.descent());
}
++maxdesc;
ParagraphList const & pars = text_->paragraphs();
+ Inset const & inset = text_->inset();
// is it a top line?
if (first == 0 && topBottomSpace) {
// some parskips VERY EASY IMPLEMENTATION
if (bufparams.paragraph_separation
== BufferParams::ParagraphSkipSeparation
- && par.ownerCode() != ERT_CODE
- && par.ownerCode() != LISTINGS_CODE
+ && inset.lyxCode() != ERT_CODE
+ && inset.lyxCode() != LISTINGS_CODE
&& pit > 0
&& ((layout.isParagraph() && par.getDepth() == 0)
|| (pars[pit - 1].layout().isParagraph()
&& !par.params().labelString().empty()) {
labeladdon = int(labelfont_metrics.maxHeight()
* layout.spacing.getValue()
- * text_->spacing(buffer, par));
+ * text_->spacing(par));
}
// special code for the top label
if ((layout.labeltype == LABEL_TOP_ENVIRONMENT
|| layout.labeltype == LABEL_BIBLIO
|| layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
- && isFirstInSequence(pit, pars)
+ && text_->isFirstInSequence(pit)
&& !par.labelString().empty())
{
labeladdon = int(
labelfont_metrics.maxHeight()
* layout.spacing.getValue()
- * text_->spacing(buffer, par)
+ * text_->spacing(par)
+ (layout.topsep + layout.labelbottomsep) * dh);
}
// a section, or between the items of a itemize or enumerate
// environment.
- pit_type prev = depthHook(pit, pars, par.getDepth());
+ pit_type prev = text_->depthHook(pit, par.getDepth());
Paragraph const & prevpar = pars[prev];
if (prev != pit
&& prevpar.layout() == layout
layoutasc = layout.topsep * dh;
}
- prev = outerHook(pit, pars);
+ prev = text_->outerHook(pit);
if (prev != pit_type(pars.size())) {
maxasc += int(pars[prev].layout().parsep * dh);
} else if (pit != 0) {
if (pars[cpit].getDepth() > pars[nextpit].getDepth()) {
usual = pars[cpit].layout().bottomsep * dh;
- cpit = depthHook(cpit, pars, pars[nextpit].getDepth());
+ cpit = text_->depthHook(cpit, pars[nextpit].getDepth());
if (pars[cpit].layout() != pars[nextpit].layout()
|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
{
return 0;
}
+ // if the first character is a separator, we are in RTL
+ // text. This character will not be painted on screen
+ // and thus we should not count it and skip to the next.
+ if (par.isSeparator(bidi.vis2log(vc)))
+ ++vc;
+
while (vc < end && tmpx <= x) {
c = bidi.vis2log(vc);
last_tmpx = tmpx;
if (body_pos > 0 && c == body_pos - 1) {
FontMetrics const & fm = theFontMetrics(
- text_->labelFont(buffer, par));
+ text_->labelFont(par));
tmpx += row.label_hfill + fm.width(layout.labelsep);
if (par.isLineSeparator(body_pos - 1))
tmpx -= singleWidth(pit, body_pos - 1);
// If lastrow is false, we don't need to compute
// the value of rtl.
- bool const rtl = lastrow ? text_->isRTL(buffer, par) : false;
+ bool const rtl = lastrow ? text_->isRTL(par) : false;
if (lastrow &&
((rtl && left_side && vc == row.pos() && x < tmpx - 5) ||
(!rtl && !left_side && vc == end && x > tmpx + 5))) {
if (y >= last->second.position() + int(pm_last.descent())) {
// We are looking for a position that is after the last paragraph in
- // the cache (which is in priciple off-screen, that is before the
+ // the cache (which is in priciple off-screen), that is before the
// visible part.
pit = last->first + 1;
if (pit == int(text_->paragraphs().size()))
}
-Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
+Row const & TextMetrics::getPitAndRowNearY(int & y, pit_type & pit,
+ bool assert_in_view, bool up)
{
ParagraphMetrics const & pm = par_metrics_[pit];
for (; rit != rlast; yy += rit->height(), ++rit)
if (yy + rit->height() > y)
break;
+
+ if (assert_in_view) {
+ if (!up && yy + rit->height() > y) {
+ if (rit != pm.rows().begin()) {
+ y = yy;
+ --rit;
+ } else if (pit != 0) {
+ --pit;
+ newParMetricsUp();
+ ParagraphMetrics const & pm2 = par_metrics_[pit];
+ rit = pm2.rows().end();
+ --rit;
+ y = yy;
+ }
+ } else if (up && yy != y) {
+ if (rit != rlast) {
+ y = yy + rit->height();
+ ++rit;
+ } else if (pit < int(text_->paragraphs().size()) - 1) {
+ ++pit;
+ newParMetricsDown();
+ ParagraphMetrics const & pm2 = par_metrics_[pit];
+ rit = pm2.rows().begin();
+ y = pm2.position();
+ }
+ }
+ }
return *rit;
}
// x,y are absolute screen coordinates
// sets cursor recursively descending into nested editable insets
-Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
+Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
+ bool assert_in_view, bool up)
{
if (lyxerr.debugging(Debug::WORKAREA)) {
LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
}
pit_type pit = getPitNearY(y);
LASSERT(pit != -1, return 0);
+
+ int yy = y; // is modified by getPitAndRowNearY
+ Row const & row = getPitAndRowNearY(yy, pit, assert_in_view, up);
- Row const & row = getRowNearY(y, pit);
- bool bound = false;
-
+ bool bound = false; // is modified by getColumnNearX
int xx = x; // is modified by getColumnNearX
pos_type const pos = row.pos()
+ getColumnNearX(pit, row, xx, bound);
cur.setTargetX(x);
// try to descend into nested insets
- Inset * inset = checkInsetHit(x, y);
+ Inset * inset = checkInsetHit(x, yy);
//lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl;
if (!inset) {
// Either we deconst editXY or better we move current_font
}
ParagraphList const & pars = text_->paragraphs();
- Inset const * insetBefore = pos? pars[pit].getInset(pos - 1): 0;
- //Inset * insetBehind = pars[pit].getInset(pos);
+ Inset const * inset_before = pos ? pars[pit].getInset(pos - 1) : 0;
// This should be just before or just behind the
// cursor position set above.
- LASSERT((pos != 0 && inset == insetBefore)
+ LASSERT(inset == inset_before
|| inset == pars[pit].getInset(pos), /**/);
// Make sure the cursor points to the position before
// this inset.
- if (inset == insetBefore) {
+ if (inset == inset_before) {
--cur.pos();
cur.boundary(false);
}
// Try to descend recursively inside the inset.
- inset = inset->editXY(cur, x, y);
+ inset = inset->editXY(cur, x, yy);
if (cur.top().text() == text_)
cur.setCurrentFont();
if (end <= row_pos)
cursor_vpos = row_pos;
else if (ppos >= end)
- cursor_vpos = text_->isRTL(buffer, par) ? row_pos : end;
+ cursor_vpos = text_->isRTL(par) ? row_pos : end;
else if (ppos > row_pos && ppos >= end)
+ //FIXME: this code is never reached!
+ // (see http://www.lyx.org/trac/changeset/8251)
// Place cursor after char at (logical) position pos - 1
cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
if (end > 0 && end < par.size() && par.isSeparator(end - 1))
skipped_sep_vpos = bidi.log2vis(end - 1);
+ if (lyxrc.paragraph_markers && text_->isRTL(par)) {
+ ParagraphList const & pars_ = text_->paragraphs();
+ if (size_type(pit + 1) < pars_.size()) {
+ FontInfo f;
+ docstring const s = docstring(1, char_type(0x00B6));
+ x += theFontMetrics(f).width(s);
+ }
+ }
+
// Inline completion RTL special case row_pos == cursor_pos:
// "__|b" => cursor_pos is right of __
if (row_pos == inlineCompletionVPos && row_pos == cursor_vpos) {
pos_type pos = bidi.vis2log(vpos);
if (body_pos > 0 && pos == body_pos - 1) {
FontMetrics const & labelfm = theFontMetrics(
- text_->labelFont(buffer, par));
+ text_->labelFont(par));
x += row.label_hfill + labelfm.width(par.layout().labelsep);
if (par.isLineSeparator(body_pos - 1))
x -= singleWidth(pit, body_pos - 1);
int l_margin = 0;
- if (text_->isMainText(buffer))
+ if (text_->isMainText())
l_margin += bv_->leftMargin();
l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
if (par.getDepth() != 0) {
// find the next level paragraph
- pit_type newpar = outerHook(pit, pars);
+ pit_type newpar = text_->outerHook(pit);
if (newpar != pit_type(pars.size())) {
if (pars[newpar].layout().isEnvironment()) {
l_margin = leftMargin(max_width, newpar);
&& pit > 0 && pars[pit - 1].layout().nextnoindent)
parindent.erase();
- FontInfo const labelfont = text_->labelFont(buffer, par);
+ FontInfo const labelfont = text_->labelFont(par);
FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
switch (layout.margintype) {
case MARGIN_FIRST_DYNAMIC:
if (layout.labeltype == LABEL_MANUAL) {
- if (pos >= par.beginOfBody()) {
+ // if we are at position 0, we are never in the body
+ if (pos > 0 && pos >= par.beginOfBody())
l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
- } else {
+ else
l_margin += labelfont_metrics.signedWidth(layout.labelindent);
- }
} else if (pos != 0
// Special case to fix problems with
// theorems (JMarc)
|| (layout.labeltype == LABEL_STATIC
&& layout.latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, pars))) {
+ && !text_->isFirstInSequence(pit))) {
l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
} else if (layout.labeltype != LABEL_TOP_ENVIRONMENT
&& layout.labeltype != LABEL_BIBLIO
|| layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
|| (layout.labeltype == LABEL_STATIC
&& layout.latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, pars)))
+ && !text_->isFirstInSequence(pit)))
&& align == LYX_ALIGN_BLOCK
&& !par.params().noindent()
// in some insets, paragraphs are never indented
- && !par.inInset().neverIndent()
+ && !text_->inset().neverIndent()
// display style insets are always centered, omit indentation
&& !(!par.empty()
&& par.isInset(pos)
|| tclass.isPlainLayout(par.layout()))
|| buffer.params().paragraph_separation == BufferParams::ParagraphIndentSeparation)
)
- {
- l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
- parindent);
- }
-
+ {
+ // use the parindent of the layout when the default indentation is used
+ // otherwise use the indentation set in the document settings
+ if (buffer.params().getIndentation().asLyXCommand() == "default")
+ l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
+ parindent);
+ else
+ l_margin += buffer.params().getIndentation().inPixels(*bv_);
+ }
+
return l_margin;
}
row.setCrc(pm.computeRowSignature(row, bparams));
bool row_has_changed = row.changed();
+ // Take this opportunity to spellcheck the row contents.
+ if (row_has_changed && lyxrc.spellcheck_continuously) {
+ WordLangTuple wl;
+ // dummy variable, not used.
+ static docstring_list suggestions;
+ pos_type from = row.pos();
+ pos_type to = row.endpos();
+ while (from < row.endpos()) {
+ text_->getPar(pit).spellCheck(from, to, wl, suggestions, false);
+ from = to + 1;
+ }
+ }
+
// Don't paint the row if a full repaint has not been requested
// and if it has not changed.
if (!pi.full_repaint && !row_has_changed) {
// 12 lines lower):
if (lyxerr.debugging(Debug::PAINTING) && inside
&& (row.selection() || pi.full_repaint || row_has_changed)) {
- string const foreword = text_->isMainText(bv_->buffer()) ?
+ string const foreword = text_->isMainText() ?
"main text redraw " : "inset text redraw: ";
LYXERR(Debug::PAINTING, foreword << "pit=" << pit << " row=" << i
<< " row_selection=" << row.selection()
rp.paintAppendix();
rp.paintDepthBar();
rp.paintChangeBar();
- if (i == 0)
+ bool const is_rtl = text_->isRTL(text_->getPar(pit));
+ if (i == 0 && !is_rtl)
rp.paintFirst();
+ if (i == nrows - 1 && is_rtl)
+ rp.paintLast();
rp.paintText();
- if (i == nrows - 1)
+ if (i == nrows - 1 && !is_rtl)
rp.paintLast();
+ if (i == 0 && is_rtl)
+ rp.paintFirst();
y += row.descent();
// Restore full_repaint status.
pi.full_repaint = tmp;
bool const begin_boundary = beg.pos() >= row.endpos();
bool const end_boundary = row.sel_end == row.endpos();
- Buffer & buffer = bv_->buffer();
DocIterator cur = beg;
cur.boundary(begin_boundary);
int x1 = cursorX(beg.top(), begin_boundary);
int const y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
int const y2 = y1 + row.height();
- int const rm = text_->isMainText(buffer) ? bv_->rightMargin() : 0;
- int const lm = text_->isMainText(buffer) ? bv_->leftMargin() : 0;
+ int const rm = text_->isMainText() ? bv_->rightMargin() : 0;
+ int const lm = text_->isMainText() ? bv_->leftMargin() : 0;
// draw the margins
if (row.begin_margin_sel) {
- if (text_->isRTL(buffer, beg.paragraph())) {
+ if (text_->isRTL(beg.paragraph())) {
pi.pain.fillRectangle(x + x1, y1, width() - rm - x1, y2 - y1,
Color_selection);
} else {
}
if (row.end_margin_sel) {
- if (text_->isRTL(buffer, beg.paragraph())) {
+ if (text_->isRTL(beg.paragraph())) {
pi.pain.fillRectangle(x + lm, y1, x2 - lm, y2 - y1,
Color_selection);
} else {