return ButtonOnly;
case Minimalistic:
- return NoButton;
+ return status() == Open ? NoButton : ButtonOnly ;
case Conglomerate:
- return status() == Open ? SubLabel : Corners;
+ return status() == Open ? SubLabel : Corners ;
}
// dummy return value to shut down a warning,
if (geometry() == TopButton
|| geometry() == LeftButton) {
InsetText::metrics(mi, textdim_);
- // This expression should not contain mi.base.texwidth
- openinlined_ = !hasFixedWidth()
- && textdim_.wid < 0.5 * mi.base.bv->workWidth();
+ openinlined_ = (textdim_.wid + dim.wid) < mi.base.textwidth;
if (openinlined_) {
// Correct for button width.
dim.wid += textdim_.wid;
void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
{
autoOpen_ = pi.base.bv->cursor().isInside(this);
- text_.background_color_ = backgroundColor();
+ pi.background_color = backgroundColor();
const int xx = x + TEXT_TO_INSET_OFFSET;
// Draw button first -- top, left or only
button_dim.y2 = top + dimc.height();
pi.pain.buttonText(xx, top + dimc.asc, layout_.labelstring, layout_.labelfont, mouse_hover_);
+ } else {
+ button_dim.x1 = 0;
+ button_dim.y1 = 0;
+ button_dim.x2 = 0;
+ button_dim.y2 = 0;
}
int textx, texty;
const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
int desc = InsetText::descent();
- if (status() == Open)
+ if (geometry() == SubLabel)
desc -= ascent();
else
desc -= 3;
- pi.pain.line(x, y + desc - 4, x, y + desc,
+ const int xx1 = xx + border_ - 1;
+ const int xx2 = x + dim_.wid - border_
+ - TEXT_TO_INSET_OFFSET + 1;
+ pi.pain.line(xx1, y + desc - 4,
+ xx1, y + desc,
layout_.labelfont.color());
if (internalStatus() == Open)
- pi.pain.line(x, y + desc,
- x + dim_.wid - 3, y + desc,
+ pi.pain.line(xx1, y + desc,
+ xx2, y + desc,
layout_.labelfont.color());
else {
// Make status_ value visible:
- pi.pain.line(x, y + desc,
- x + 4, y + desc,
+ pi.pain.line(xx1, y + desc,
+ xx1 + 4, y + desc,
layout_.labelfont.color());
- pi.pain.line(x + dim_.wid - 7, y + desc,
- x + dim_.wid -3, y + desc,
+ pi.pain.line(xx2 - 4, y + desc,
+ xx2, y + desc,
layout_.labelfont.color());
}
pi.pain.line(x + dim_.wid - 3, y + desc, x + dim_.wid - 3, y + desc - 4,
layout_.labelfont.color());
- // the label of the charstyle. Can be toggled.
- if (status() == Open) {
+ // the label below the text. Can be toggled.
+ if (geometry() == SubLabel) {
Font font(layout_.labelfont);
font.realize(Font(Font::ALL_SANE));
font.decSize();
if (cur.isInside(this)) {
y -= ascent();
y += 3;
- pi.pain.line(x, y + 4, x, y, layout_.labelfont.color());
- pi.pain.line(x + 4, y, x, y, layout_.labelfont.color());
- pi.pain.line(x + dim_.wid - 3, y + 4, x + dim_.wid - 3, y,
+ pi.pain.line(xx1, y + 4, xx1, y, layout_.labelfont.color());
+ pi.pain.line(xx1 + 4, y, xx1, y, layout_.labelfont.color());
+ pi.pain.line(xx2, y + 4, x + dim_.wid - 3, y,
layout_.labelfont.color());
- pi.pain.line(x + dim_.wid - 7, y, x + dim_.wid - 3, y,
+ pi.pain.line(xx2 - 4, y, xx2, y,
layout_.labelfont.color());
}
break;