Get Conglomerate-style rendering back into order

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20769 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2007-10-06 08:15:40 +00:00
parent 7341e94905
commit 9585df177e

View File

@ -195,8 +195,7 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
int d = 0; int d = 0;
docstring s = layout_.labelstring; docstring s = layout_.labelstring;
theFontMetrics(font).rectText(s, w, a, d); theFontMetrics(font).rectText(s, w, a, d);
dim.wid = max(dim.wid, w); dim.des += a + d;
dim.des += d;
break; break;
} }
case TopButton: case TopButton:
@ -320,9 +319,10 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
int d = 0; int d = 0;
docstring s = layout_.labelstring; docstring s = layout_.labelstring;
theFontMetrics(font).rectText(s, w, a, d); theFontMetrics(font).rectText(s, w, a, d);
desc += d; int const ww = max(textdim.wid, w);
pi.pain.rectText(x + (textdim.wid - w) / 2, y + desc + a, pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
s, font, Color::none, Color::none); s, font, Color::none, Color::none);
desc += d;
} }
// a visual cue when the cursor is inside the inset // a visual cue when the cursor is inside the inset