Dimension dim = dimensionCollapsed();
if (geometry() == NoButton)
return translateIfPossible(layout_->labelstring());
- if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
+ if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des || isOpen())
return docstring();
- docstring default_tip;
- switch (status_) {
- case Open:
- default_tip = _("Left-click to collapse the inset");
- break;
- case Collapsed:
- default_tip = _("Left-click to open the inset");
- break;
- }
-
OutputParams rp(&buffer().params().encoding());
odocstringstream ods;
InsetText::plaintext(ods, rp);
// shorten it if necessary
if (content_tip.size() > 200)
content_tip = content_tip.substr(0, 200) + "...";
- if (!isOpen() && !content_tip.empty())
- return content_tip + '\n' + default_tip;
- return default_tip;
+ return content_tip;
}
Inset::EDITABLE InsetCollapsable::editable() const
{
- return geometry() != ButtonOnly? HIGHLY_EDITABLE : IS_EDITABLE;
+ return geometry() != ButtonOnly ? HIGHLY_EDITABLE : IS_EDITABLE;
}
switch (cmd.action) {
case LFUN_MOUSE_PRESS:
- if (hitButton(cmd) && geometry() != NoButton) {
+ if (hitButton(cmd)) {
switch (cmd.button()) {
case mouse_button::button1:
- // reset selection if necessary (see bug 3060)
- if (cur.selection())
- cur.bv().cursor().clearSelection();
- else
- cur.noUpdate();
- cur.dispatched();
- return;
+ case mouse_button::button3:
+ // Pass the command to the enclosing InsetText,
+ // so that the cursor gets set.
+ cur.undispatched();
+ break;
case mouse_button::none:
case mouse_button::button2:
- case mouse_button::button3:
case mouse_button::button4:
case mouse_button::button5:
// Nothing to do.
- cur.undispatched();
- return;
+ cur.noUpdate();
+ break;
}
- }
- if (geometry() == NoButton
- || (geometry() != ButtonOnly && !hitButton(cmd)))
+ } else if (geometry() != ButtonOnly)
InsetText::doDispatch(cur, cmd);
else
cur.undispatched();
case LFUN_MOUSE_MOTION:
case LFUN_MOUSE_DOUBLE:
case LFUN_MOUSE_TRIPLE:
- if (geometry() == NoButton)
- InsetText::doDispatch(cur, cmd);
- else if (geometry() != ButtonOnly
- && !hitButton(cmd))
+ if (hitButton(cmd))
+ cur.noUpdate();
+ else if (geometry() != ButtonOnly)
InsetText::doDispatch(cur, cmd);
else
cur.undispatched();
break;
case LFUN_MOUSE_RELEASE:
- if (geometry() == NoButton
- || (geometry() != ButtonOnly && !hitButton(cmd))) {
+ if (!hitButton(cmd)) {
// The mouse click has to be within the inset!
- InsetText::doDispatch(cur, cmd);
+ if (geometry() != ButtonOnly)
+ InsetText::doDispatch(cur, cmd);
+ else
+ cur.undispatched();
break;
}
if (cmd.button() != mouse_button::button1) {
- cur.dispatched();
+ // Nothing to do.
+ cur.noUpdate();
break;
}
// if we are selecting, we do not want to
FuncStatus & flag) const
{
switch (cmd.action) {
- // suppress these
+ // FIXME At present, these are being enabled and disabled according to
+ // whether PASSTHRU has been set in the InsetLayout. This makes some
+ // sense, but there are other checks that should really be done. E.g.,
+ // one should not be able to inset IndexPrint inside an optional argument!!
case LFUN_ACCENT_ACUTE:
case LFUN_ACCENT_BREVE:
case LFUN_ACCENT_CARON:
case LFUN_FLOAT_LIST_INSERT:
case LFUN_FLOAT_WIDE_INSERT:
case LFUN_FONT_BOLD:
+ case LFUN_FONT_BOLDSYMBOL:
case LFUN_FONT_TYPEWRITER:
case LFUN_FONT_DEFAULT:
case LFUN_FONT_EMPH:
case LFUN_LABEL_INSERT:
case LFUN_LINE_INSERT:
case LFUN_NEWPAGE_INSERT:
- case LFUN_LAYOUT:
- case LFUN_LAYOUT_PARAGRAPH:
case LFUN_LAYOUT_TABULAR:
case LFUN_MARGINALNOTE_INSERT:
case LFUN_MATH_DISPLAY:
case LFUN_NOTE_INSERT:
case LFUN_NOTE_NEXT:
case LFUN_OPTIONAL_INSERT:
- case LFUN_PARAGRAPH_PARAMS:
- case LFUN_PARAGRAPH_PARAMS_APPLY:
- case LFUN_PARAGRAPH_SPACING:
- case LFUN_PARAGRAPH_UPDATE:
case LFUN_REFERENCE_NEXT:
case LFUN_SERVER_GOTO_FILE_ROW:
case LFUN_SERVER_NOTIFY:
}
return InsetText::getStatus(cur, cmd, flag);
+ case LFUN_LAYOUT:
+ flag.setEnabled(!forcePlainLayout());
+ return true;
+
+ case LFUN_LAYOUT_PARAGRAPH:
+ case LFUN_PARAGRAPH_PARAMS:
+ case LFUN_PARAGRAPH_PARAMS_APPLY:
+ case LFUN_PARAGRAPH_SPACING:
+ case LFUN_PARAGRAPH_UPDATE:
+ flag.setEnabled(allowParagraphCustomization());
+ return true;
+
case LFUN_INSET_TOGGLE:
if (cmd.argument() == "open")
flag.setEnabled(status_ != Open);