InsetParamsDialog: fix Restore button enabling/disabling.

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 68a85f49e2b4312e9c4054e871e5b0e7cfe6d353..080ef43f648a82ebfda240eee0e8f1da57d998d5 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -103,9 +103,6 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
        // requires a full repaint
        bool pi_full_repaint = pi_.full_repaint;
 
-       // FIXME: text_metrics_.width() is only about 1.0857 * mi.base.textwidth
-       pi_.base.textwidth = text_metrics_.width();
-
        // FIXME: We should always use font, see documentation of
        // noFontChange() in Inset.h.
        pi_.base.font = inset->noFontChange() ?
@@ -345,14 +342,18 @@ void RowPainter::paintForeignMark(double orig_x, Language const * lang,
 }
 
 
-void RowPainter::paintMisspelledMark(double orig_x, int desc)
+void RowPainter::paintMisspelledMark(double orig_x, int desc, bool changed)
 {
-       int const y = yo_ + desc;
+       // derive the offset from zoom factor specified by user in percent
+       // if changed the misspelled marker gets placed slightly lower than normal
+       // to avoid drawing at the same vertical offset 
+       int const offset = int(1.5 * lyxrc.zoom / 100.0); // [percent]
+       int const y = yo_ + desc + (changed ? offset : 0);
        pi_.pain.line(int(orig_x), y, int(x_), y, Color_red, Painter::line_onoffdash, 1.0);
 }
 
 
-void RowPainter::paintFromPos(pos_type & vpos)
+void RowPainter::paintFromPos(pos_type & vpos, bool changed)
 {
        pos_type const pos = bidi_.vis2log(vpos);
        Font const orig_font = text_metrics_.displayFont(pit_, pos);
@@ -385,7 +386,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
        paintForeignMark(orig_x, orig_font.language());
 
        if (lyxrc.spellcheck_continuously && misspelled_) {
-               paintMisspelledMark(orig_x, 2);
+               paintMisspelledMark(orig_x, 2, changed);
        }
 }
 
@@ -887,7 +888,7 @@ void RowPainter::paintText()
 
                } else {
                        // paint as many characters as possible.
-                       paintFromPos(vpos);
+                       paintFromPos(vpos, change_running.changed());
                }
 
                // Is the inline completion after character?