#include "lyxlex.h"
#include "metricsinfo.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::string;
InsetCommand::InsetCommand(InsetCommandParams const & p,
string const & mailer_name)
- : p_(p.getCmdName(), p.getContents(), p.getOptions()),
+ : p_(p.getCmdName(), p.getContents(), p.getOptions(), p.getSecOptions()),
mailer_name_(mailer_name),
set_label_(false)
{}
void InsetCommand::draw(PainterInfo & pi, int x, int y) const
{
- xo_ = x;
- yo_ = y;
+ setPosCache(pi, x, y);
button_.draw(pi, x, y);
}
}
-DispatchResult
-InsetCommand::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void InsetCommand::priv_dispatch(LCursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
+ case LFUN_INSET_REFRESH:
+ set_label_ = false;
+ break;
+
case LFUN_INSET_MODIFY: {
InsetCommandParams p;
InsetCommandMailer::string2params(mailer_name_, cmd.argument, p);
- if (p.getCmdName().empty())
- return DispatchResult(false);
- setParams(p);
- cur.bv().update();
- return DispatchResult(true, true);
+ if (p.getCmdName().empty()) {
+ cur.undispatched();
+ } else {
+ setParams(p);
+ cur.bv().update();
+ }
+ break;
}
case LFUN_INSET_DIALOG_UPDATE:
InsetCommandMailer(cmd.argument, *this).updateDialog(&cur.bv());
- return DispatchResult(true, true);
+ break;
case LFUN_INSET_DIALOG_SHOW:
case LFUN_MOUSE_RELEASE: {
if (!mailer_name_.empty())
InsetCommandMailer(mailer_name_, *this).showDialog(&cur.bv());
- return DispatchResult(true);
+ break;
}
default:
- return DispatchResult(false);
+ InsetOld::priv_dispatch(cur, cmd);
+ break;
}
}