InsetCollapsable::InsetCollapsable
(BufferParams const & bp, CollapseStatus status)
: InsetText(bp), label(from_ascii("Label")), status_(status),
- openinlined_(false), autoOpen_(false)
+ openinlined_(false), autoOpen_(false), mouse_hover_(false)
{
setAutoBreakRows(true);
setDrawFrame(true);
}
+InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs):
+ InsetText(rhs),
+ labelfont_(rhs.labelfont_),
+ button_dim(rhs.button_dim),
+ topx(rhs.topx),
+ topbaseline(rhs.topbaseline),
+ label(rhs.label),
+ status_(rhs.status_),
+ openinlined_(rhs.openinlined_),
+ autoOpen_(rhs.autoOpen_),
+ textdim_(rhs.textdim_),
+ // the sole purpose of this copy constructor
+ mouse_hover_(false)
+{
+}
+
+
void InsetCollapsable::write(Buffer const & buf, ostream & os) const
{
os << "status ";
bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
{
autoOpen_ = mi.base.bv->cursor().isInside(this);
- mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
+ mi.base.textwidth -= (int) (1.5 * TEXT_TO_INSET_OFFSET);
if (status() == Inlined) {
InsetText::metrics(mi, dim);
if (status() == Open) {
InsetText::metrics(mi, textdim_);
// This expression should not contain mi.base.texwidth
- openinlined_ = textdim_.wid < 0.5 * mi.base.bv->workWidth();
+ openinlined_ = !hasFixedWidth()
+ && textdim_.wid < 0.5 * mi.base.bv->workWidth();
if (openinlined_) {
// Correct for button width, and re-fit
mi.base.textwidth -= dim.wid;
} 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.asc += TEXT_TO_INSET_OFFSET;
dim.des += TEXT_TO_INSET_OFFSET;
- dim.wid += 2 * TEXT_TO_INSET_OFFSET;
- mi.base.textwidth += 2 * 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;
}
+bool InsetCollapsable::setMouseHover(bool mouse_hover)
+{
+ mouse_hover_ = mouse_hover;
+ return true;
+}
+
+
void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
{
const int xx = x + TEXT_TO_INSET_OFFSET;
button_dim.y1 = top;
button_dim.y2 = top + dimc.height();
- pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_);
+ pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_, mouse_hover_);
if (status() == Open) {
int textx, texty;
InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
{
//lyxerr << "InsetCollapsable: edit xy" << endl;
- if (status() == Collapsed)
+ if (status() == Collapsed || (button_dim.contains(x, y) && status() != Inlined))
return this;
cur.push(*this);
return InsetText::editXY(cur, x, y);
switch (cmd.action) {
case LFUN_MOUSE_PRESS:
- if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
+ if (cmd.button() == mouse_button::button1 && hitButton(cmd) && status() != Inlined) {
+ // reset selection if necessary (see bug 3060)
+ if (cur.selection())
+ cur.bv().cursor().clearSelection();
+ else
+ cur.noUpdate();
cur.dispatched();
- cur.noUpdate();
break;
}
if (status() == Inlined)
}
if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
- // Left button is clicked, the user asks to toggle the inset
- // visual state.
+ // if we are selecting, we do not want to
+ // toggle the inset.
+ if (cur.selection())
+ break;
+ // Left button is clicked, the user asks to
+ // toggle the inset visual state.
cur.dispatched();
cur.updateFlags(Update::Force | Update::FitCursor);
if (status() == Collapsed) {
}
// The mouse click is within the opened inset.
- InsetText::doDispatch(cur, cmd);
+ if (status() == Open)
+ InsetText::doDispatch(cur, cmd);
break;
case LFUN_INSET_TOGGLE:
setButtonLabel();
if (status_ == Collapsed)
cur.leaveInset(*this);
+ // Because we save CollapseStatus in lyx file, change of status
+ // should lead to a dirty buffer. (This fixes bug 2993).
+ cur.bv().buffer()->markDirty();
}
labelfont_ = font;
}
-docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp)
+docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp) const
{
FloatList const & floats = bp.getLyXTextClass().floats();
FloatList::const_iterator it = floats[type];