namespace lyx {
-using graphics::PreviewLoader;
-
using std::endl;
using std::string;
-using std::max;
-using std::min;
using std::ostream;
{
switch (decoration()) {
case Classic:
- if (status_ == Open || autoOpen_) {
+ if (status() == Open) {
if (openinlined_)
return LeftButton;
else
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
{
+ using std::max;
+
autoOpen_ = mi.base.bv->cursor().isInside(this);
- mi.base.textwidth -= (int) (1.5 * TEXT_TO_INSET_OFFSET);
+ mi.base.textwidth -= int(1.5 * TEXT_TO_INSET_OFFSET);
- switch (decoration()) {
- case Minimalistic:
+ switch (geometry()) {
+ case NoButton:
InsetText::metrics(mi, dim);
break;
- case Conglomerate:
+ case Corners:
InsetText::metrics(mi, dim);
- if (status() == Open) {
- // consider width of the inset label
- Font font(layout_.labelfont);
- font.realize(Font(Font::ALL_SANE));
- font.decSize();
- font.decSize();
- int w = 0;
- int a = 0;
- int d = 0;
- docstring s = layout_.labelstring;
- theFontMetrics(font).rectText(s, w, a, d);
- dim.wid = max(dim.wid, w);
- }
- if (status() == Open)
- dim.des += ascent();
- else {
- dim.des -= 3;
- dim.asc -= 3;
- }
+ dim.des -= 3;
+ dim.asc -= 3;
break;
- case Classic:
+ case SubLabel: {
+ InsetText::metrics(mi, dim);
+ // consider width of the inset label
+ Font font(layout_.labelfont);
+ font.realize(Font(Font::ALL_SANE));
+ font.decSize();
+ font.decSize();
+ int w = 0;
+ int a = 0;
+ int d = 0;
+ docstring s = layout_.labelstring;
+ theFontMetrics(font).rectText(s, w, a, d);
+ dim.wid = max(dim.wid, w);
+ dim.des += ascent();
+ break;
+ }
+ case TopButton:
+ case LeftButton:
+ case ButtonOnly:
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_) {
- // Correct for button width, and re-fit
- mi.base.textwidth -= dim.wid;
- InsetText::metrics(mi, textdim_);
- 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);
+ 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.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);
+ 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();
+ int const xx = x + TEXT_TO_INSET_OFFSET;
// Draw button first -- top, left or only
Dimension dimc = dimensionCollapsed();
int const top = y - ascent() + TEXT_TO_INSET_OFFSET;
- if (decoration() == Classic) {
+ 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_);
+ } else {
+ button_dim.x1 = 0;
+ button_dim.y1 = 0;
+ button_dim.x2 = 0;
+ button_dim.y2 = 0;
}
int textx, texty;
switch (geometry()) {
case LeftButton:
textx = xx + dimc.width();
- texty = top + textdim_.asc;
+ texty = top;
InsetText::draw(pi, textx, texty);
break;
case TopButton:
textx = xx;
- texty = top + dimc.height() + textdim_.asc;
+ texty = top + dimc.height();
InsetText::draw(pi, textx, texty);
break;
case ButtonOnly:
break;
case NoButton:
textx = xx;
- texty = y + textdim_.asc;
+ texty = y;
InsetText::draw(pi, textx, texty);
break;
case SubLabel:
case Corners:
textx = xx;
- texty = y + textdim_.asc;
+ texty = y;
const_cast<InsetCollapsable *>(this)->setDrawFrame(false);
InsetText::draw(pi, 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();
s, font, Color::none, Color::none);
}
- // a visual cue when the cursor is inside the inset
+ // a visual clue when the cursor is inside the inset
Cursor & cur = pi.base.bv->cursor();
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;
}
setPosCache(pi, x, y);
+ pi.background_color = old_color;
}
InsetText::drawSelection(pi, x, y);
break;
case TopButton:
- y += dimensionCollapsed().des + textdim_.asc;
+ y += dimensionCollapsed().des;
InsetText::drawSelection(pi, x, y);
break;
case ButtonOnly:
case LeftButton:
x += dimensionCollapsed().wid;
break;
- case TopButton:
+ case TopButton: {
+ TextMetrics const & tm = bv.textMetrics(&text_);
y += dimensionCollapsed().height() - ascent()
- + TEXT_TO_INSET_OFFSET + textdim_.asc;
+ + TEXT_TO_INSET_OFFSET + tm.ascent();
break;
+ }
case NoButton:
case SubLabel:
case Corners:
docstring label;
pos_type const max_length = 15;
pos_type const p_siz = paragraphs().begin()->size();
- pos_type const n = min(max_length, p_siz);
+ pos_type const n = std::min(max_length, p_siz);
pos_type i = 0;
pos_type j = 0;
for (; i < n && j < p_siz; ++j) {
//lyxerr << "InsetCollapsable: edit xy" << endl;
if (geometry() == ButtonOnly
|| (button_dim.contains(x, y)
- && decoration() != Minimalistic))
+ && geometry() != NoButton))
return this;
cur.push(*this);
return InsetText::editXY(cur, x, y);
case LFUN_MOUSE_PRESS:
if (cmd.button() == mouse_button::button1
&& hitButton(cmd)
- && decoration() != Minimalistic) {
+ && geometry() != NoButton) {
// reset selection if necessary (see bug 3060)
if (cur.selection())
cur.bv().cursor().clearSelection();
cur.dispatched();
break;
}
- if (decoration() == Minimalistic)
+ if (geometry() == NoButton)
InsetText::doDispatch(cur, cmd);
else if (geometry() != ButtonOnly
&& !hitButton(cmd))
case LFUN_MOUSE_MOTION:
case LFUN_MOUSE_DOUBLE:
case LFUN_MOUSE_TRIPLE:
- if (decoration() == Minimalistic)
+ if (geometry() == NoButton)
InsetText::doDispatch(cur, cmd);
else if (geometry() != ButtonOnly
&& !hitButton(cmd))
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3) {
- if (decoration() == Conglomerate) {
+ // There is no button to right click:
+ if (geometry() == Corners ||
+ geometry() == SubLabel ||
+ geometry() == NoButton) {
if (internalStatus() == Open)
setStatus(cur, Collapsed);
else
}
}
- if (decoration() == Minimalistic) {
+ if (geometry() == NoButton) {
// The mouse click has to be within the inset!
InsetText::doDispatch(cur, cmd);
break;
setButtonLabel();
if (status_ == Collapsed)
cur.leaveInset(*this);
- // Because the collapse status is part of the inset and thus an
- // integral part of the Buffer contents a changed status must be
- // signaled to all views of current buffer.
- cur.bv().buffer().changed();
}
projects / lyx.git / blobdiff