anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

A more radical approach to inset background painting

Browse Source 
Now by default all insets paint their own background when needed. This
means that 63cf3297 and part of 9940acc5 can be reverted.

To avoid extra painting, background drawing is disabled for
InsetCommand and InsetCollapsable. These insets draw background as
part of their normal drawing activity.

This will avoid drawing artifacts with InsetNewpage, InsetVSpace and
probably some others.
This commit is contained in:
Jean-Marc Lasgouttes 2016-08-17 11:21:38 +02:00
parent 6f82f51cbe
commit e194c9ce27
10 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/insets/Inset.cpp
View File

@ -520,6 +520,16 @@ void Inset::metricsMarkers2(Dimension & dim, int framesize) const
}
void Inset::drawBackground(PainterInfo & pi, int x, int y) const
{
if (pi.full_repaint && backgroundColor(pi) == Color_none)
return;
Dimension const dim = dimension(*pi.base.bv);
pi.pain.fillRectangle(x, y - dim.asc, dim.wid, dim.asc + dim.des,
pi.backgroundColor(this));
}
void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
{
ColorCode pen_color = mouseHovered(pi.base.bv) || editing(pi.base.bv)?

2
src/insets/Inset.h
View File

@ -190,7 +190,7 @@ public:
virtual void drawSelection(PainterInfo &, int, int) const {}
/// draw inset background if the inset has an own background and a
/// selection is drawn by drawSelection.
virtual void drawBackground(PainterInfo &, int, int) const {}
virtual void drawBackground(PainterInfo &, int, int) const;
///
virtual bool editing(BufferView const * bv) const;
///

2
src/insets/InsetCollapsable.h
View File

@ -54,6 +54,8 @@ public:
void metrics(MetricsInfo &, Dimension &) const;
///
void draw(PainterInfo & pi, int x, int y) const;
///
virtual void drawBackground(PainterInfo &, int, int) const {}
/// return x,y of given position relative to the inset's baseline
void cursorPos(BufferView const & bv, CursorSlice const & sl,

2
src/insets/InsetCommand.h
View File

@ -78,6 +78,8 @@ public:
///
void draw(PainterInfo & pi, int x, int y) const;
///
virtual void drawBackground(PainterInfo &, int, int) const {}
///
void latex(otexstream &, OutputParams const &) const;
///
int plaintext(odocstringstream & ods, OutputParams const & op,

10
src/insets/InsetQuotes.cpp
View File

@ -211,16 +211,6 @@ void InsetQuotes::metrics(MetricsInfo & mi, Dimension & dim) const
}
void InsetQuotes::drawBackground(PainterInfo & pi, int x, int y) const
{
if (pi.full_repaint)
return;
Dimension const dim = dimension(*pi.base.bv);
pi.pain.fillRectangle(x, y - dim.asc, dim.wid, dim.asc + dim.des,
pi.backgroundColor(this));
}
void InsetQuotes::draw(PainterInfo & pi, int x, int y) const
{
FontInfo font = pi.base.font;

2
src/insets/InsetQuotes.h
View File

@ -70,8 +70,6 @@ public:
///
void metrics(MetricsInfo &, Dimension &) const;
///
void drawBackground(PainterInfo & pi, int x, int y) const;
///
void draw(PainterInfo & pi, int x, int y) const;
///
void write(std::ostream &) const;

10
src/insets/InsetSpecialChar.cpp
View File

@ -134,16 +134,6 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
}
void InsetSpecialChar::drawBackground(PainterInfo & pi, int x, int y) const
{
if (pi.full_repaint)
return;
Dimension const dim = dimension(*pi.base.bv);
pi.pain.fillRectangle(x, y - dim.asc, dim.wid, dim.asc + dim.des,
pi.backgroundColor(this));
}
namespace {
// helper function: draw text and update x.

2
src/insets/InsetSpecialChar.h
View File

@ -61,8 +61,6 @@ public:
///
void metrics(MetricsInfo &, Dimension &) const;
///
void drawBackground(PainterInfo & pi, int x, int y) const;
///
void draw(PainterInfo & pi, int x, int y) const;
///
void write(std::ostream &) const;

11
src/mathed/MathMacroTemplate.cpp
View File

@ -583,17 +583,6 @@ void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
}
void MathMacroTemplate::drawBackground(PainterInfo & pi, int x, int y) const
{
if (pi.full_repaint)
return;
Dimension const dim = dimension(*pi.base.bv);
pi.pain.fillRectangle(x, y - dim.asc, dim.wid, dim.asc + dim.des,
pi.backgroundColor(this));
}
void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
{
// FIXME: Calling Changer on the same object repeatedly is inefficient.

2
src/mathed/MathMacroTemplate.h
View File

@ -92,8 +92,6 @@ public:
///
void draw(PainterInfo & pi, int x, int y) const;
///
void drawBackground(PainterInfo & pi, int x, int y) const;
///
void metrics(MetricsInfo & mi, Dimension & dim) const;
/// identifies macro templates
MathMacroTemplate * asMacroTemplate() { return this; }