anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 13:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Blueline-under-insets fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10805 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2006-02-03 17:21:51 +00:00
parent d55a7468c0
commit aac47f6579
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2006-02-03 Martin Vermeer <martin.vermeer@hut.fi>
* rowpainter.C (paintForeignMark): fix foreign blue line under
insets
2006-01-30 Jürgen Spitzmüller <j.spitzmueller@gmx.de> 2006-01-30 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* * text2.C (deleteEmptyParagraphMechanism): fix off-by-one error of the start * * text2.C (deleteEmptyParagraphMechanism): fix off-by-one error of the start

9
src/rowpainter.C
View File

@ -71,7 +71,7 @@ public:
void paintText(); void paintText();
private: private:
void paintForeignMark(double orig_x, LyXFont const & font); void paintForeignMark(double orig_x, LyXFont const & font, int desc = 0);
void paintHebrewComposeChar(lyx::pos_type & vpos, LyXFont const & font); void paintHebrewComposeChar(lyx::pos_type & vpos, LyXFont const & font);
void paintArabicComposeChar(lyx::pos_type & vpos, LyXFont const & font); void paintArabicComposeChar(lyx::pos_type & vpos, LyXFont const & font);
void paintChars(lyx::pos_type & vpos, LyXFont font, void paintChars(lyx::pos_type & vpos, LyXFont font,
@ -288,7 +288,7 @@ void RowPainter::paintChars(pos_type & vpos, LyXFont font,
} }
void RowPainter::paintForeignMark(double orig_x, LyXFont const & font) void RowPainter::paintForeignMark(double orig_x, LyXFont const & font, int desc)
{ {
if (!lyxrc.mark_foreign_language) if (!lyxrc.mark_foreign_language)
return; return;
@ -297,7 +297,7 @@ void RowPainter::paintForeignMark(double orig_x, LyXFont const & font)
if (font.language() == bv_.buffer()->params().language) if (font.language() == bv_.buffer()->params().language)
return; return;
int const y = yo_ + 1; int const y = yo_ + 1 + desc;
pain_.line(int(orig_x), y, int(x_), y, LColor::language); pain_.line(int(orig_x), y, int(x_), y, LColor::language);
} }
@ -313,7 +313,8 @@ void RowPainter::paintFromPos(pos_type & vpos)
if (par_.isInset(pos)) { if (par_.isInset(pos)) {
paintInset(pos, orig_font); paintInset(pos, orig_font);
++vpos; ++vpos;
paintForeignMark(orig_x, orig_font); paintForeignMark(orig_x, orig_font,
par_.getInset(pos)->descent());
return; return;
} }