#include "insets/InsetText.h"
+#include "mathed/InsetMath.h"
+
#include "support/debug.h"
#include "support/gettext.h"
#include "support/textutils.h"
row_(row), pit_(pit), par_(text.paragraphs()[pit]),
pm_(text_metrics_.parMetrics(pit)),
bidi_(bidi), change_(pi_.change_),
- xo_(x), yo_(y), width_(text_metrics_.width())
+ xo_(x), yo_(y), width_(text_metrics_.width()),
+ line_thickness_(1.0), line_offset_(2)
{
- // derive the line thickness from zoom factor
- // the zoom is given in percent
- double const scale_ = lyxrc.zoom / 100.0;
-
bidi_.computeTables(par_, pi_.base.bv->buffer(), row_);
- // (increase thickness at 150%, 250% etc.)
- line_thickness_ = scale_ < 1.0 ? 1.0 : int(scale_ + 0.5);
- line_offset_ = int(1.5 * line_thickness_) + (scale_ < 1.0 ? 1 : 2);
+
+ if (lyxrc.zoom >= 100) {
+ // derive the line thickness from zoom factor
+ // the zoom is given in percent
+ // (increase thickness at 150%, 250% etc.)
+ line_thickness_ = (float)(int((lyxrc.zoom + 50) / 100.0));
+ // adjust line_offset_ too
+ line_offset_ = int(2 * line_thickness_) + 1;
+ }
x_ = row_.x + xo_;
{
// if changed the misspelled marker gets placed slightly lower than normal
// to avoid drawing at the same vertical offset
- int const y = yo_ + (changed ? line_thickness_ + 1 : 0) + line_offset_;
+ int const y = yo_ + (changed ? int(line_thickness_ + 1.0) : 0) + line_offset_;
pi_.pain.line(int(orig_x), y, int(x_), y, Color_error,
Painter::line_onoffdash, line_thickness_);
}
lang == "farsi";
// spelling correct?
- bool const misspelled_ =
+ bool const misspelled =
lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
// draw as many chars as we can
paintForeignMark(orig_x, orig_font.language());
- if (lyxrc.spellcheck_continuously && misspelled_) {
- paintMisspelledMark(orig_x, changed);
+ if (lyxrc.spellcheck_continuously && misspelled) {
+ // check for cursor position
+ // don't draw misspelled marker for words at cursor position
+ // we don't want to disturb the process of text editing
+ BufferView const * bv = pi_.base.bv;
+ DocIterator const nw = bv->cursor().newWord();
+ bool new_word = false;
+ if (!nw.empty() && par_.id() == nw.paragraph().id()) {
+ pos_type cpos = nw.pos();
+ if (cpos > 0 && cpos == par_.size() && !par_.isWordSeparator(cpos-1))
+ --cpos;
+ else if (cpos > 0 && par_.isWordSeparator(cpos))
+ --cpos;
+ new_word = par_.isSameSpellRange(pos, cpos) ;
+ }
+ if (!new_word)
+ paintMisspelledMark(orig_x, changed);
}
}
// If outer row has changed, nested insets are repaint completely.
Inset const * inset = par_.getInset(pos);
bool const nested_inset = inset &&
- (inset->asInsetText() || inset->asInsetTabular());
+ ((inset->asInsetMath() &&
+ !inset->asInsetMath()->asMacroTemplate())
+ || inset->asInsetText()
+ || inset->asInsetTabular());
if (!nested_inset)
continue;
if (x_ > pi_.base.bv->workWidth()