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

fix drawing of change tracker strikeout

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9736 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2005-03-22 10:57:10 +00:00
parent c605824a66
commit f527d0a134
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-03-22 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* rowpainter.C: use default text height for drawing change tracker
strikeout lines.
2005-03-21 Jürgen Spitzmüller <j.spitzmueller@gmx.de> 2005-03-21 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* lyx_main.C: fix binding of tabulator key (especially S-Tab). * lyx_main.C: fix binding of tabulator key (especially S-Tab).

13
src/rowpainter.C
View File

@ -664,10 +664,9 @@ void RowPainter::paintText()
// if we reach the end of a struck out range, paint it // if we reach the end of a struck out range, paint it
// we also don't paint across things like tables // we also don't paint across things like tables
if (running_strikeout && (highly_editable_inset || !is_struckout)) { if (running_strikeout && (highly_editable_inset || !is_struckout)) {
// FIXME this should take real text height into account, not // calculate 1/3 height of the buffer's default font
// the whole row including padding whitespace int const middle =
//int const middle = yo_ + (- row_.ascent() + row_.top_of_text()) / 2; yo_ - font_metrics::maxAscent(text_.defaultfont_) / 3;
int const middle = yo_ - row_.ascent() / 2;
pain_.line(last_strikeout_x, middle, int(x_), middle, pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin); LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false; running_strikeout = false;
@ -718,9 +717,9 @@ void RowPainter::paintText()
// if we reach the end of a struck out range, paint it // if we reach the end of a struck out range, paint it
if (running_strikeout) { if (running_strikeout) {
//top_of_text = font_metrics::maxAscent(font); // calculate 1/3 height of the buffer's default font
//int const middle = yo_ - top_of_text() / 2; int const middle =
int const middle = yo_ - row_.ascent() / 2; yo_ - font_metrics::maxAscent(text_.defaultfont_) / 3;
pain_.line(last_strikeout_x, middle, int(x_), middle, pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin); LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false; running_strikeout = false;