anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#7120 adjust the line thickness to mark changes, foreign language and misspelled text to zoom factor in user preferences

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36869 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2010-12-13 16:18:37 +00:00
parent 7ca6110534
commit 48b071d983
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/rowpainter.cpp
View File

@ -62,7 +62,15 @@ RowPainter::RowPainter(PainterInfo & pi,
bidi_(bidi), change_(pi_.change_), bidi_(bidi), change_(pi_.change_),
xo_(x), yo_(y), width_(text_metrics_.width()) xo_(x), yo_(y), width_(text_metrics_.width())
{ {
// 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_); 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);
x_ = row_.x + xo_; x_ = row_.x + xo_;
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl; //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
@ -349,20 +357,19 @@ void RowPainter::paintForeignMark(double orig_x, Language const * lang,
if (lang == pi_.base.bv->buffer().params().language) if (lang == pi_.base.bv->buffer().params().language)
return; return;
int const y = yo_ + 1 + desc; int const y = yo_ + 1 + desc + int(line_thickness_/2);
pi_.pain.line(int(orig_x), y, int(x_), y, Color_language); pi_.pain.line(int(orig_x), y, int(x_), y, Color_language,
Painter::line_solid, line_thickness_);
} }
void RowPainter::paintMisspelledMark(double orig_x, int desc, bool changed) void RowPainter::paintMisspelledMark(double orig_x, bool changed)
{ {
// derive the offset from zoom factor specified by user in percent
// if changed the misspelled marker gets placed slightly lower than normal // if changed the misspelled marker gets placed slightly lower than normal
// to avoid drawing at the same vertical offset // to avoid drawing at the same vertical offset
int const offset = int(1.5 * lyxrc.zoom / 100.0); // [percent] int const y = yo_ + (changed ? line_thickness_ + 1 : 0) + line_offset_;
int const y = yo_ + desc + (changed ? offset : 0) + 1;
pi_.pain.line(int(orig_x), y, int(x_), y, Color_error, pi_.pain.line(int(orig_x), y, int(x_), y, Color_error,
Painter::line_onoffdash, 2.0); Painter::line_onoffdash, line_thickness_);
} }
@ -399,7 +406,7 @@ void RowPainter::paintFromPos(pos_type & vpos, bool changed)
paintForeignMark(orig_x, orig_font.language()); paintForeignMark(orig_x, orig_font.language());
if (lyxrc.spellcheck_continuously && misspelled_) { if (lyxrc.spellcheck_continuously && misspelled_) {
paintMisspelledMark(orig_x, 2, changed); paintMisspelledMark(orig_x, changed);
} }
} }
@ -856,9 +863,9 @@ void RowPainter::paintText()
FontMetrics const & fm FontMetrics const & fm
= theFontMetrics(pi_.base.bv->buffer().params().getFont()); = theFontMetrics(pi_.base.bv->buffer().params().getFont());
int const y_bar = change_running.deleted() ? int const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6; yo_ - fm.maxAscent() / 3 : yo_ + line_offset_;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar, pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
change_running.color(), Painter::line_solid, 0.5); change_running.color(), Painter::line_solid, line_thickness_);
// Change might continue with a different author or type // Change might continue with a different author or type
if (change.changed() && !highly_editable_inset) { if (change.changed() && !highly_editable_inset) {
@ -916,9 +923,9 @@ void RowPainter::paintText()
FontMetrics const & fm FontMetrics const & fm
= theFontMetrics(pi_.base.bv->buffer().params().getFont()); = theFontMetrics(pi_.base.bv->buffer().params().getFont());
int const y_bar = change_running.deleted() ? int const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6; yo_ - fm.maxAscent() / 3 : yo_ + line_offset_;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar, pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
change_running.color(), Painter::line_solid, 0.5); change_running.color(), Painter::line_solid, line_thickness_);
change_running.setUnchanged(); change_running.setUnchanged();
} }
} }

4
src/rowpainter.h
View File

@ -59,7 +59,7 @@ public:
private: private:
void paintForeignMark(double orig_x, Language const * lang, int desc = 0); void paintForeignMark(double orig_x, Language const * lang, int desc = 0);
void paintMisspelledMark(double orig_x, int desc, bool changed); void paintMisspelledMark(double orig_x, bool changed);
void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font); void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font);
void paintArabicComposeChar(pos_type & vpos, FontInfo const & font); void paintArabicComposeChar(pos_type & vpos, FontInfo const & font);
void paintChars(pos_type & vpos, FontInfo const & font, void paintChars(pos_type & vpos, FontInfo const & font,
@ -104,6 +104,8 @@ private:
int const yo_; // current baseline int const yo_; // current baseline
double x_; double x_;
int width_; int width_;
int line_thickness_;
int line_offset_;
}; };
} // namespace lyx } // namespace lyx