anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compiling errors caused by r18701 (moving drawMarkers and drawMarkers2 back to Inset)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18708 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-06-07 21:36:42 +00:00
parent 27bc728f14
commit 358e7136f2
4 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/insets/Inset.cpp
View File

@ -280,6 +280,37 @@ void Inset::metricsMarkers2(Dimension & dim, int framesize) const
}
void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
{
Color::color pen_color = mouseHovered() || editing(pi.base.bv)?
Color::mathframe : Color::mathcorners;
int const t = x + width() - 1;
int const d = y + descent();
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 Inset::drawMarkers2(PainterInfo & pi, int x, int y) const
{
Color::color pen_color = mouseHovered() || editing(pi.base.bv)?
Color::mathframe : Color::mathcorners;
drawMarkers(pi, x, y);
int const t = x + width() - 1;
int const a = y - ascent();
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);
}
bool Inset::editing(BufferView * bv) const
{
return bv->cursor().isInside(this);

10
src/insets/Inset.h
View File

@ -130,6 +130,10 @@ public:
/// draw inset decoration if necessary.
/// This can use \c drawMarkers() for example.
virtual void drawDecoration(PainterInfo &, int, int) const {}
/// draw four angular markers
void drawMarkers(PainterInfo & pi, int x, int y) const;
/// draw two angular markers
void drawMarkers2(PainterInfo & pi, int x, int y) const;
/// add space for markers
void metricsMarkers(Dimension & dim, int framesize = 1) const;
/// add space for markers
@ -195,6 +199,12 @@ public:
/// is called when the mouse enter or leave this inset
/// return true if this inset needs repaint
virtual bool setMouseHover(bool) { return false; }
/// return true if this inset is hovered (under mouse)
/// This is by now only used by mathed to draw corners
/// (Inset::drawMarkers() and Inset::drawMarkers2()).
/// Other insets do not have to redefine this function to
/// return the correct status of mouseHovered.
virtual bool mouseHovered() const { return false; }
/// request "external features"
virtual void validate(LaTeXFeatures &) const {}

31
src/mathed/InsetMathNest.cpp
View File

@ -360,37 +360,6 @@ int InsetMathNest::latex(Buffer const &, odocstream & os,
}
void InsetMathNest::drawMarkers(PainterInfo & pi, int x, int y) const
{
Color::color pen_color = mouse_hover_ || editing(pi.base.bv) ?
Color::mathframe : Color::mathcorners;
int const t = x + width() - 1;
int const d = y + descent();
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 InsetMathNest::drawMarkers2(PainterInfo & pi, int x, int y) const
{
Color::color pen_color = mouse_hover_ || editing(pi.base.bv)?
Color::mathframe : Color::mathcorners;
drawMarkers(pi, x, y);
int const t = x + width() - 1;
int const a = y - ascent();
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);
}
bool InsetMathNest::setMouseHover(bool mouse_hover)
{
mouse_hover_ = mouse_hover;

6
src/mathed/InsetMathNest.h
View File

@ -109,12 +109,10 @@ public:
/// This signal is emitted when the inset is destroyed.
boost::signal<void()> * destroyedSignal() { return &destroyed; }
/// draw four angular markers
void drawMarkers(PainterInfo & pi, int x, int y) const;
/// draw two angular markers
void drawMarkers2(PainterInfo & pi, int x, int y) const;
///
bool setMouseHover(bool mouse_hover);
///
bool mouseHovered() const { return mouse_hover_; }
protected:
///