X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathNest.h;h=3d4977d63c44e38a9d42c4dbf954bd8953760259;hb=9296344b9a26191a2092d175a51e357ecc35145d;hp=80f5f6d9d67f3a46f4f78a4f8a0ac20dac607e39;hpb=f6d4bce12303a2f30ea129ee86e7f7d879668260;p=lyx.git diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h index 80f5f6d9d6..3d4977d63c 100644 --- a/src/mathed/InsetMathNest.h +++ b/src/mathed/InsetMathNest.h @@ -33,24 +33,10 @@ public: /// void setBuffer(Buffer &); - // The method below hides inset::metrics() intentionally! - // We have to tell clang not to be fussy about that. -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Woverloaded-virtual" -#endif - /// the size is usually some sort of convex hull of the cells - void metrics(MetricsInfo const & mi) const; -#ifdef __clang__ -#pragma clang diagnostic pop -#endif + /// Update the cells metrics + void cellsMetrics(MetricsInfo const & mi) const; /// draw background if locked void draw(PainterInfo & pi, int x, int y) const; - /// draw selection background - void drawSelection(PainterInfo & pi, int x, int y) const; - /// draw decorations. - void drawDecoration(PainterInfo & pi, int x, int y) const - { drawMarkers(pi, x, y); } /// void updateBuffer(ParIterator const &, UpdateType); /// identifies NestInsets @@ -61,7 +47,7 @@ public: void cursorPos(BufferView const & bv, CursorSlice const & sl, bool boundary, int & x, int & y) const; /// - void edit(Cursor & cur, bool front, + void edit(Cursor & cur, bool front, EntryDirection entry_from = ENTRY_DIRECTION_IGNORE); /// Inset * editXY(Cursor & cur, int x, int y); @@ -121,7 +107,7 @@ public: /// bool setMouseHover(BufferView const * bv, bool mouse_hover) const; /// - bool mouseHovered(BufferView const * bv) const + bool mouseHovered(BufferView const * bv) const { return mouse_hover_[bv]; } /// @@ -143,6 +129,9 @@ public: /// InsetCode lyxCode() const { return MATH_NEST_CODE; } + /// + bool confirmDeletion() const { return nargs() > 0; } + protected: /// InsetMathNest(InsetMathNest const & inset); @@ -204,7 +193,7 @@ protected: bool lock_; /// mutable std::map mouse_hover_; -}; +};