InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
: UpdatableInset(), collapsed_(collapsed), inset(bp),
- button_length(0), button_top_y(0), button_bottom_y(0),
- label("Label"),
+ button_dim(0, 0, 0, 0), label("Label"),
#if 0
autocollapse(false),
#endif
InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
: UpdatableInset(in), collapsed_(in.collapsed_),
framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset),
- button_length(0), button_top_y(0), button_bottom_y(0),
- label(in.label),
+ button_dim(0, 0, 0, 0), label(in.label),
#if 0
autocollapse(in.autocollapse),
#endif
void InsetCollapsable::dimension_collapsed(Dimension & dim) const
{
font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
- dim.wid += 2 * TEXT_TO_INSET_OFFSET;
}
void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
{
- pi.pain.buttonText(x + TEXT_TO_INSET_OFFSET, y, label, labelfont);
+ pi.pain.buttonText(x, y, label, labelfont);
}
Dimension dim_collapsed;
dimension_collapsed(dim_collapsed);
- int const aa = ascent();
- button_length = dim_collapsed.width();
- button_top_y = -aa;
- button_bottom_y = -aa + dim_collapsed.height();
+ int const aa = ascent();
+ button_dim.x1 = 0;
+ button_dim.x2 = dim_collapsed.width();
+ button_dim.y1 = -aa;
+ button_dim.y2 = -aa + dim_collapsed.height();
if (!isOpen()) {
draw_collapsed(pi, x, y);
inset.draw(pi, x, y);
} else {
draw_collapsed(pi, old_x, bl);
- int const yy = bl + dim_collapsed.descent() + inset.ascent();
- inset.draw(pi, x, yy);
+ inset.draw(pi, x, bl + dim_collapsed.descent() + inset.ascent());
}
}
return;
}
- if ((cmd.button() != mouse_button::button3) && (cmd.x < button_length) &&
- (cmd.y >= button_top_y) && (cmd.y <= button_bottom_y))
+ if (cmd.button() != mouse_button::button3 && hitButton(cmd))
{
if (collapsed_) {
collapsed_ = false;
bv->updateInset(this);
bv->buffer()->markDirty();
}
- } else if (!collapsed_ && (cmd.y > button_bottom_y)) {
+ } else if (!collapsed_ && (cmd.y > button_dim.y2)) {
ret = (inset.localDispatch(adjustCommand(cmd)) == DISPATCHED);
}
if (cmd.button() == mouse_button::button3 && !ret)
}
+bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
+{
+ return button_dim.contained(cmd.x, cmd.y);
+}
+
+
InsetOld::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
{
lyxerr << "InsetCollapsable::localDispatch: "
FuncRequest cmd1 = cmd;
if (!bv->lockInset(this))
return DISPATCHED;
- if (cmd.y <= button_bottom_y) {
+ if (cmd.y <= button_dim.y2) {
cmd1.y = 0;
} else {
cmd1.y = ascent() + cmd.y - (height_collapsed() + inset.ascent());
}
case LFUN_MOUSE_PRESS:
- if (!collapsed_ && cmd.y > button_bottom_y)
+ if (!collapsed_ && cmd.y > button_dim.y2)
inset.localDispatch(adjustCommand(cmd));
return DISPATCHED;
case LFUN_MOUSE_MOTION:
- if (!collapsed_ && cmd.y > button_bottom_y)
+ if (!collapsed_ && cmd.y > button_dim.y2)
inset.localDispatch(adjustCommand(cmd));
return DISPATCHED;