commit 18fb9cd7f9886295dbae66eb6ac060f9ac367f2d
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Jun 7 12:20:33 2017 +0200
Fix drawing of collpsable insets
This is a follow-up to e194c9ce. There was actually no reason to let
InsetCollapsable and InsetText draw their own background. It is more
correct to remove the existing code and let the generic
Inset::drawBackground take command.
This allows to revert d207e85c.
Fixes bug #10587.
---
src/insets/InsetCollapsable.cpp | 3 +--
src/insets/InsetCollapsable.h | 2 --
src/insets/InsetText.cpp | 4 ----
src/insets/InsetText.h | 2 --
4 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 92802b9..213e058 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -335,11 +335,10 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int
y) const
int w = 0;
int a = 0;
int d = 0;
- Color const col = pi.full_repaint ? Color_none :
pi.backgroundColor(this);
theFontMetrics(font).rectText(buttonLabel(bv), w, a, d);
int const ww = max(textdim.wid, w);
pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
- buttonLabel(bv), font, col,
Color_none);
+ buttonLabel(bv), font, Color_none,
Color_none);
}
int const y1 = y - textdim.asc + 3;
diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index a426db0..4c08bdc 100644
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -54,8 +54,6 @@ 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,
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 7680ee5..2e60692 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -221,10 +221,6 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
int const xframe = x + TEXT_TO_INSET_OFFSET / 2;
bool change_drawn = false;
if (drawFrame_ || pi.full_repaint) {
- if (pi.full_repaint)
- pi.pain.fillRectangle(xframe, yframe, w, h,
- pi.backgroundColor(this));
-
// Change color of the frame in tracked changes, like for
tabulars.
// Only do so if the color is not custom. But do so even if
RowPainter
// handles the strike-through already.
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index eb52bc8..bfaee44 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -60,8 +60,6 @@ public:
void metrics(MetricsInfo & mi, Dimension & dim) const;
///
void draw(PainterInfo & pi, int x, int y) const;
- /// Drawing background is handled in draw
- virtual void drawBackground(PainterInfo &, int, int) const {}
///
bool editable() const { return true; }
///
