namespace lyx {
using std::endl;
-using std::string;
+using std::max;
using std::ostream;
+using std::string;
InsetCollapsable::CollapseStatus InsetCollapsable::status() const
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,
status_(rhs.status_),
openinlined_(rhs.openinlined_),
autoOpen_(rhs.autoOpen_),
- textdim_(rhs.textdim_),
// the sole purpose of this copy constructor
mouse_hover_(false)
{
}
-bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
{
- using std::max;
-
autoOpen_ = mi.base.bv->cursor().isInside(this);
- mi.base.textwidth -= int(1.5 * TEXT_TO_INSET_OFFSET);
switch (geometry()) {
case NoButton:
case Corners:
InsetText::metrics(mi, dim);
dim.des -= 3;
- dim.asc -= 3;
+ dim.asc -= 1;
break;
case SubLabel: {
InsetText::metrics(mi, dim);
int d = 0;
docstring s = layout_.labelstring;
theFontMetrics(font).rectText(s, w, a, d);
- dim.wid = max(dim.wid, w);
- dim.des += ascent();
+ dim.des += a + d;
break;
}
case TopButton:
dim = dimensionCollapsed();
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();
+ Dimension textdim;
+ InsetText::metrics(mi, textdim);
+ openinlined_ = (textdim.wid + dim.wid) < mi.base.textwidth;
if (openinlined_) {
- // FIXME: this is not ideal but we need to clear it
- // out because the Row::changed() status is reset.
- mi.base.bv->textMetrics(&text_).clear();
- // Correct for button width, and re-fit
- mi.base.textwidth -= dim.wid;
- InsetText::metrics(mi, textdim_);
- mi.base.textwidth += dim.wid;
- dim.wid += textdim_.wid;
- dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
- dim.asc = textdim_.asc;
+ // Correct for button width.
+ dim.wid += textdim.wid;
+ dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
+ dim.asc = textdim.asc;
} else {
- dim.des += textdim_.height() + TEXT_TO_BOTTOM_OFFSET;
- dim.wid = max(dim.wid, textdim_.wid);
- if (hasFixedWidth())
- dim.wid = max(dim.wid, mi.base.textwidth);
+ dim.des += textdim.height() + TEXT_TO_BOTTOM_OFFSET;
+ dim.wid = max(dim.wid, textdim.wid);
}
}
break;
}
- dim.asc += TEXT_TO_INSET_OFFSET;
- dim.des += TEXT_TO_INSET_OFFSET;
- dim.wid += int(1.5 * TEXT_TO_INSET_OFFSET);
- mi.base.textwidth += int(1.5 * TEXT_TO_INSET_OFFSET);
- bool const changed = dim_ != dim;
- dim_ = dim;
- return changed;
}
void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
{
autoOpen_ = pi.base.bv->cursor().isInside(this);
- text_.background_color_ = backgroundColor();
- const int xx = x + TEXT_TO_INSET_OFFSET;
+ int const old_color = pi.background_color;
+ pi.background_color = backgroundColor();
// Draw button first -- top, left or only
Dimension dimc = dimensionCollapsed();
- int const top = y - ascent() + TEXT_TO_INSET_OFFSET;
+
if (geometry() == TopButton ||
geometry() == LeftButton ||
geometry() == ButtonOnly) {
- button_dim.x1 = xx + 0;
- button_dim.x2 = xx + dimc.width();
- button_dim.y1 = top;
- button_dim.y2 = top + dimc.height();
-
- pi.pain.buttonText(xx, top + dimc.asc, layout_.labelstring, layout_.labelfont, mouse_hover_);
+ button_dim.x1 = x + 0;
+ button_dim.x2 = x + dimc.width();
+ button_dim.y1 = y - dimc.asc;
+ button_dim.y2 = y + dimc.des;
+
+ pi.pain.buttonText(x, y, layout_.labelstring, layout_.labelfont, mouse_hover_);
+ } else {
+ button_dim.x1 = 0;
+ button_dim.y1 = 0;
+ button_dim.x2 = 0;
+ button_dim.y2 = 0;
}
+ Dimension const textdim = InsetText::dimension(*pi.base.bv);
+ int const baseline = y;
int textx, texty;
switch (geometry()) {
case LeftButton:
- textx = xx + dimc.width();
- texty = top + textdim_.asc;
+ textx = x + dimc.width();
+ texty = baseline;
InsetText::draw(pi, textx, texty);
break;
case TopButton:
- textx = xx;
- texty = top + dimc.height() + textdim_.asc;
+ textx = x;
+ texty = baseline + dimc.des + textdim.asc;
InsetText::draw(pi, textx, texty);
break;
case ButtonOnly:
break;
case NoButton:
- textx = xx;
- texty = y + textdim_.asc;
+ textx = x;
+ texty = baseline;
InsetText::draw(pi, textx, texty);
break;
case SubLabel:
case Corners:
- textx = xx;
- texty = y + textdim_.asc;
+ textx = x;
+ texty = baseline;
const_cast<InsetCollapsable *>(this)->setDrawFrame(false);
InsetText::draw(pi, textx, texty);
const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
- int desc = InsetText::descent();
- if (status() == Open)
- desc -= ascent();
- else
+ int desc = textdim.descent();
+ if (geometry() == Corners)
desc -= 3;
- pi.pain.line(x, y + desc - 4, x, y + desc,
+ const int xx1 = x + TEXT_TO_INSET_OFFSET - 1;
+ const int xx2 = x + textdim.wid - 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,
+ pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.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();
int w = 0;
int a = 0;
int d = 0;
- // FIXME UNICODE
docstring s = layout_.labelstring;
theFontMetrics(font).rectText(s, w, a, d);
- pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
+ int const ww = max(textdim.wid, w);
+ pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
s, font, Color::none, Color::none);
+ desc += d;
}
// a visual cue when the cursor is inside the inset
Cursor & cur = pi.base.bv->cursor();
if (cur.isInside(this)) {
- y -= ascent();
+ y -= textdim.asc;
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, xx2, 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;
}
- setPosCache(pi, x, y);
-}
-
-
-void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
-{
- x += TEXT_TO_INSET_OFFSET;
- switch (geometry()) {
- case LeftButton:
- x += dimensionCollapsed().wid;
- InsetText::drawSelection(pi, x, y);
- break;
- case TopButton:
- y += dimensionCollapsed().des + textdim_.asc;
- InsetText::drawSelection(pi, x, y);
- break;
- case ButtonOnly:
- break;
- case NoButton:
- case SubLabel:
- case Corners:
- InsetText::drawSelection(pi, x, y);
- break;
- }
+ pi.background_color = old_color;
}
void InsetCollapsable::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
{
+ if (geometry() == ButtonOnly)
+ status_ = Open;
BOOST_ASSERT(geometry() != ButtonOnly);
InsetText::cursorPos(bv, sl, boundary, x, y);
+ Dimension const textdim = InsetText::dimension(bv);
switch (geometry()) {
case LeftButton:
x += dimensionCollapsed().wid;
break;
- case TopButton:
- y += dimensionCollapsed().height() - ascent()
- + TEXT_TO_INSET_OFFSET + textdim_.asc;
+ case TopButton: {
+ y += dimensionCollapsed().des + textdim.asc;
break;
+ }
case NoButton:
case SubLabel:
case Corners:
// Cannot get here
break;
}
- x += TEXT_TO_INSET_OFFSET;
}
return Minimalistic;
if (layout_.decoration == "conglomerate")
return Conglomerate;
- if (name() == from_ascii("CharStyle"))
+ if (name() == from_ascii("Flex"))
return Conglomerate;
return Classic;
}
}
}
int i = InsetText::latex(buf, os, runparams);
- if (!layout_.latexname.empty())
+ if (!layout_.latexname.empty()) {
if (layout_.latextype == "command") {
os << "}";
} else if (layout_.latextype == "environment") {
os << "\n\\end{" << from_utf8(layout_.latexname) << "}\n";
i += 4;
}
+ }
return i;
}
void InsetCollapsable::validate(LaTeXFeatures & features) const
{
// Force inclusion of preamble snippet in layout file
- features.addPreambleSnippet(layout_.preamble);
+ features.require(layout_.name);
InsetText::validate(features);
}
projects / lyx.git / blobdiff