From 82d3607f05c315ca4bb7750e4826fece8315a965 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Tue, 25 Sep 2007 06:49:04 +0000 Subject: [PATCH] Hopefully fix 'Corners' and 'SubLabel' insets drawing. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20479 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetCollapsable.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp index 3bd437579c..c53b8a5850 100644 --- a/src/insets/InsetCollapsable.cpp +++ b/src/insets/InsetCollapsable.cpp @@ -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(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()); -- 2.39.2