anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hopefully fix 'Corners' and 'SubLabel' insets drawing.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20479 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-09-25 06:49:04 +00:00
parent 21c4d09a19
commit 82d3607f05
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/insets/InsetCollapsable.cpp
View File

@ -196,8 +196,7 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
docstring s = layout_.labelstring;
theFontMetrics(font).rectText(s, w, a, d);
dim.wid = max(dim.wid, w);
// FIXME
//dim.des += ascent();
dim.des += d;
break;
}
case TopButton:
@ -286,9 +285,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
int desc = textdim.descent();
if (geometry() == SubLabel)
desc -= 0; // ascent();
else
if (geometry() == Corners)
desc -= 3;
const int xx1 = x + TEXT_TO_INSET_OFFSET - 1;
@ -323,6 +320,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
int d = 0;
docstring s = layout_.labelstring;
theFontMetrics(font).rectText(s, w, a, d);
desc += d;
pi.pain.rectText(x + (textdim.wid - w) / 2, y + desc + a,
s, font, Color::none, Color::none);
}
@ -330,8 +328,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
// a visual cue when the cursor is inside the inset
Cursor & cur = pi.base.bv->cursor();
if (cur.isInside(this)) {
// FIXME
//y -= ascent();
y -= textdim.asc;
y += 3;
pi.pain.line(xx1, y + 4, xx1, y, layout_.labelfont.color());
pi.pain.line(xx1 + 4, y, xx1, y, layout_.labelfont.color());