InsetName("accent", InsetBase::ACCENT_CODE),
InsetName("math", InsetBase::MATH_CODE),
InsetName("index", InsetBase::INDEX_CODE),
+ InsetName("nomenclature", InsetBase::NOMENCL_CODE),
InsetName("include", InsetBase::INCLUDE_CODE),
InsetName("graphics", InsetBase::GRAPHICS_CODE),
InsetName("bibitem", InsetBase::BIBITEM_CODE),
InsetName("cite", InsetBase::CITE_CODE),
InsetName("float_list", InsetBase::FLOAT_LIST_CODE),
InsetName("index_print", InsetBase::INDEX_PRINT_CODE),
+ InsetName("nomencl_print", InsetBase::NOMENCL_PRINT_CODE),
InsetName("optarg", InsetBase::OPTARG_CODE),
InsetName("environment", InsetBase::ENVIRONMENT_CODE),
InsetName("hfill", InsetBase::HFILL_CODE),
void InsetBase::dispatch(LCursor & cur, FuncRequest & cmd)
{
- cur.needsUpdate();
+ cur.updateFlags(Update::Force | Update::FitCursor);
cur.dispatched();
doDispatch(cur, cmd);
}
}
-std::string const & InsetBase::getInsetName() const
+docstring const & InsetBase::getInsetName() const
{
- static std::string const name = "unknown";
+ static docstring const name = from_ascii("unknown");
return name;
}
void InsetBase::drawMarkers(PainterInfo & pi, int x, int y) const
{
- if (!editing(pi.base.bv))
- return;
+ LColor::color pen_color = editing(pi.base.bv)?
+ LColor::mathframe : LColor::background;
+
int const t = x + width() - 1;
int const d = y + descent();
- pi.pain.line(x, d - 3, x, d, LColor::mathframe);
- pi.pain.line(t, d - 3, t, d, LColor::mathframe);
- pi.pain.line(x, d, x + 3, d, LColor::mathframe);
- pi.pain.line(t - 3, d, t, d, LColor::mathframe);
+ pi.pain.line(x, d - 3, x, d, pen_color);
+ pi.pain.line(t, d - 3, t, d, pen_color);
+ pi.pain.line(x, d, x + 3, d, pen_color);
+ pi.pain.line(t - 3, d, t, d, pen_color);
setPosCache(pi, x, y);
}
void InsetBase::drawMarkers2(PainterInfo & pi, int x, int y) const
{
- if (!editing(pi.base.bv))
- return;
+ LColor::color pen_color = editing(pi.base.bv)?
+ LColor::mathframe : LColor::background;
+
drawMarkers(pi, x, y);
int const t = x + width() - 1;
int const a = y - ascent();
- pi.pain.line(x, a + 3, x, a, LColor::mathframe);
- pi.pain.line(t, a + 3, t, a, LColor::mathframe);
- pi.pain.line(x, a, x + 3, a, LColor::mathframe);
- pi.pain.line(t - 3, a, t, a, LColor::mathframe);
+ pi.pain.line(x, a + 3, x, a, pen_color);
+ pi.pain.line(t, a + 3, t, a, pen_color);
+ pi.pain.line(x, a, x + 3, a, pen_color);
+ pi.pain.line(t - 3, a, t, a, pen_color);
setPosCache(pi, x, y);
}
}
-int InsetBase::xo(BufferView & bv) const
+int InsetBase::xo(BufferView const & bv) const
{
return bv.coordCache().getInsets().x(this);
}
-int InsetBase::yo(BufferView & bv) const
+int InsetBase::yo(BufferView const & bv) const
{
return bv.coordCache().getInsets().y(this);
}
-bool InsetBase::covers(BufferView & bv, int x, int y) const
+bool InsetBase::covers(BufferView const & bv, int x, int y) const
{
//lyxerr << "InsetBase::covers, x: " << x << " y: " << y
// << " xo: " << xo(bv) << " yo: " << yo()