#include "Buffer.h"
#include "CoordCache.h"
#include "Cursor.h"
-#include "support/debug.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Changes.h"
#include "insets/InsetText.h"
+#include "support/debug.h"
#include "support/textutils.h"
#include <boost/crc.hpp>
FontInfo const font = getLabelFont();
FontMetrics const & fm = theFontMetrics(font);
- docstring const str = par_.getLabelstring();
+ docstring const str = par_.labelString();
if (!str.empty()) {
double x = x_;
layout->labeltype == LABEL_BIBLIO ||
layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
FontInfo const font = getLabelFont();
- if (!par_.getLabelstring().empty()) {
- docstring const str = par_.getLabelstring();
+ docstring const str = par_.labelString();
+ if (!str.empty()) {
double spacing_val = 1.0;
if (!parparams.spacing().isDefault())
spacing_val = parparams.spacing().getValue();
FontMetrics const & fm = theFontMetrics(font);
int const size = int(0.75 * fm.maxAscent());
int const y = yo_ - size;
- int x = is_rtl ? nestMargin() + changebarMargin() : width_ - size;
+ int const max_row_width = width_ - size - Inset::TEXT_TO_INSET_OFFSET;
+ int x = is_rtl ? nestMargin() + changebarMargin()
+ : max_row_width - text_metrics_.rightMargin(pm_);
- if (width_ - int(row_.width()) <= size)
- x += (size - width_ + row_.width() + 1) * (is_rtl ? -1 : 1);
+ // If needed, move the box a bit to avoid overlapping with text.
+ int const rem = max_row_width - row_.width();
+ if (rem <= 0)
+ x += is_rtl ? rem : - rem;
if (endlabel == END_LABEL_BOX)
pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
{
pos_type const end = row_.endpos();
for (pos_type pos = row_.pos(); pos != end; ++pos) {
- if (!par_.isInset(pos))
- continue;
-
// If outer row has changed, nested insets are repaint completely.
Inset const * inset = par_.getInset(pos);
-
+ if (!inset)
+ continue;
if (x_ > pi_.base.bv->workWidth())
continue;
-
x_ = pi_.base.bv->coordCache().getInsets().x(inset);
paintInset(inset, pos);
}
bool is_struckout = false;
int last_strikeout_x = 0;
+ // check for possible inline completion
+ DocIterator const & inlineCompletionPos = pi_.base.bv->inlineCompletionPos();
+ pos_type inlineCompletionVPos = -1;
+ if (inlineCompletionPos.inTexted()
+ && inlineCompletionPos.text() == &text_
+ && inlineCompletionPos.pit() == pit_
+ && inlineCompletionPos.pos() >= row_.pos()
+ && inlineCompletionPos.pos() <= row_.endpos()) {
+ // draw logically behind the previous character
+ inlineCompletionVPos = bidi_.log2vis(inlineCompletionPos.pos() - 1);
+ }
+
// Use font span to speed things up, see below
FontSpan font_span;
Font font;
// it's in the last row of a paragraph; see skipped_sep_vpos declaration
if (end > 0 && end < par_.size() && par_.isSeparator(end - 1))
skipped_sep_vpos = bidi_.log2vis(end - 1);
-
+
for (pos_type vpos = row_.pos(); vpos < end; ) {
if (x_ > pi_.base.bv->workWidth())
break;
if (vpos < font_span.first || vpos > font_span.last) {
font_span = par_.fontSpan(vpos);
font = text_metrics_.getDisplayFont(pit_, vpos);
+
+ // split font span if inline completion is inside
+ if (font_span.first <= inlineCompletionVPos
+ && font_span.last > inlineCompletionVPos)
+ font_span.last = inlineCompletionVPos;
}
const int width_pos = pm_.singleWidth(pos, font);
last_strikeout_x = int(x_);
}
- bool const highly_editable_inset = par_.isInset(pos)
- && par_.getInset(pos)->editable() == Inset::HIGHLY_EDITABLE;
+ Inset const * inset = par_.getInset(pos);
+ bool const highly_editable_inset = inset
+ && inset->editable() == Inset::HIGHLY_EDITABLE;
// If we reach the end of a struck out range, paint it.
// We also don't paint across things like tables
x_ += row_.label_hfill + lwidth - width_pos;
}
+
+ // Is the inline completion in front of character?
+ if (font.isRightToLeft() && vpos == inlineCompletionVPos)
+ paintInlineCompletion(font);
if (par_.isSeparator(pos)) {
Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
paintForeignMark(orig_x, orig_font.language());
++vpos;
- } else if (par_.isInset(pos)) {
+ } else if (inset) {
// If outer row has changed, nested insets are repaint completely.
- Inset const * inset = par_.getInset(pos);
pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
paintInset(inset, pos);
++vpos;
// paint as many characters as possible.
paintFromPos(vpos);
}
+
+ // Is the inline completion after character?
+ if (!font.isRightToLeft() && vpos - 1 == inlineCompletionVPos)
+ paintInlineCompletion(font);
}
// if we reach the end of a struck out range, paint it
}
}
+
+void RowPainter::paintInlineCompletion(Font const & font)
+{
+ docstring completion = pi_.base.bv->inlineCompletion();
+ FontInfo f = font.fontInfo();
+
+ // right to left?
+ if (font.isRightToLeft())
+ reverse(completion.begin(), completion.end());
+
+ // draw the unique and the non-unique completion part
+ // Note: this is not time-critical as it is
+ // only done once per screen.
+ size_t uniqueTo = pi_.base.bv->inlineCompletionUniqueChars();
+ docstring s1 = completion.substr(0, uniqueTo);
+ docstring s2 = completion.substr(uniqueTo);
+
+ if (s1.size() > 0) {
+ f.setColor(Color_inlinecompletion);
+ pi_.pain.text(x_, yo_, s1, f);
+ x_ += theFontMetrics(font).width(s1);
+ }
+
+ if (s2.size() > 0) {
+ f.setColor(Color_nonunique_inlinecompletion);
+ pi_.pain.text(x_, yo_, s2, f);
+ x_ += theFontMetrics(font).width(s2);
+ }
+}
+
} // namespace lyx
projects / lyx.git / blobdiff