anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix metrics debugging

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27955 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2008-12-22 18:16:05 +00:00
parent ac1fd9b37f
commit 07676f2330
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/rowpainter.cpp
View File

@ -107,11 +107,12 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
font.fontInfo(); font.fontInfo();
pi_.ltr_pos = (bidi_.level(pos) % 2 == 0); pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
pi_.erased_ = erased_ || par_.isDeleted(pos); pi_.erased_ = erased_ || par_.isDeleted(pos);
pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_); int const x1 = int(x_);
pi_.base.bv->coordCache().insets().add(inset, x1, yo_);
// insets are painted completely. Recursive // insets are painted completely. Recursive
inset->drawBackground(pi_, int(x_), yo_); inset->drawBackground(pi_, x1, yo_);
inset->drawSelection(pi_, int(x_), yo_); inset->drawSelection(pi_, x1, yo_);
inset->draw(pi_, int(x_), yo_); inset->draw(pi_, x1, yo_);
Dimension const & dim = pm_.insetDimension(inset); Dimension const & dim = pm_.insetDimension(inset);
@ -123,28 +124,6 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
pi_.full_repaint = pi_full_repaint; pi_.full_repaint = pi_full_repaint;
#ifdef DEBUG_METRICS #ifdef DEBUG_METRICS
int const x1 = int(x_ - dim.width());
Dimension dim2;
LASSERT(max_witdh_ > 0, /**/);
int right_margin = text_metrics_.rightMargin(pm_);
int const w = max_witdh_ - leftMargin() - right_margin;
MetricsInfo mi(pi_.base.bv, font.fontInfo(), w);
inset->metrics(mi, dim2);
if (dim.wid != dim2.wid)
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
<< " draw width " << dim.width()
<< "> metrics width " << dim2.wid << "." << endl;
if (dim->asc != dim2.asc)
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
<< " draw ascent " << dim.ascent()
<< "> metrics ascent " << dim2.asc << "." << endl;
if (dim2.descent() != dim.des)
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
<< " draw ascent " << dim.descent()
<< "> metrics descent " << dim2.des << "." << endl;
LASSERT(dim2.wid == dim.wid, /**/);
LASSERT(dim2.asc == dim.asc, /**/);
LASSERT(dim2.des == dim.des, /**/);
int const x2 = x1 + dim.wid; int const x2 = x1 + dim.wid;
int const y1 = yo_ + dim.des; int const y1 = yo_ + dim.des;
int const y2 = yo_ - dim.asc; int const y2 = yo_ - dim.asc;