commit 325fbab4636507b62773e3873090e5f35590c95c
Author: Guillaume Munch <[email protected]>
Date: Mon May 23 17:01:48 2016 +0100
Change tracking cue: for Graphics
Strike through deleted graphics.
---
src/insets/InsetGraphics.h | 2 ++
src/insets/RenderGraphic.cpp | 31 ++++++++++++++-----------------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h
index 5270f2b..a2fef00 100644
--- a/src/insets/InsetGraphics.h
+++ b/src/insets/InsetGraphics.h
@@ -54,6 +54,8 @@ public:
InsetGraphicsParams getParams() const { return params_;}
///
bool clickable(BufferView const &, int, int) const { return true; }
+ ///
+ bool canPaintChange(BufferView const &) const { return true; };
private:
///
diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index 48b41e2..9d9cf31 100644
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -182,41 +182,38 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y)
const
{
// This will draw the graphics. If the graphics has not been
// loaded yet, we draw just a rectangle.
+ int const x1 = x + Inset::TEXT_TO_INSET_OFFSET;
+ int const y1 = y - dim_.asc;
+ int const w = dim_.wid - 2 * Inset::TEXT_TO_INSET_OFFSET;
+ int const h = dim_.height();
- if (displayGraphic(params_) && readyToDisplay(loader_)) {
- pi.pain.image(x + Inset::TEXT_TO_INSET_OFFSET,
- y - dim_.asc,
- dim_.wid - 2 * Inset::TEXT_TO_INSET_OFFSET,
- dim_.asc + dim_.des,
- *loader_.image());
+ if (displayGraphic(params_) && readyToDisplay(loader_))
+ pi.pain.image(x1, y1, w, h, *loader_.image());
- } else {
- pi.pain.rectangle(x + Inset::TEXT_TO_INSET_OFFSET,
- y - dim_.asc,
- dim_.wid - 2 * Inset::TEXT_TO_INSET_OFFSET,
- dim_.asc + dim_.des,
- Color_foreground);
+ else {
+ Color c = pi.change_.changed() ? pi.change_.color() :
Color_foreground;
+ pi.pain.rectangle(x1, y1, w, h, c);
// Print the file name.
FontInfo msgFont = pi.base.font;
+ msgFont.setPaintColor(c);
msgFont.setFamily(SANS_FAMILY);
string const justname = params_.filename.onlyFileName();
if (!justname.empty()) {
msgFont.setSize(FONT_SIZE_FOOTNOTE);
- pi.pain.text(x + Inset::TEXT_TO_INSET_OFFSET + 6,
- y - theFontMetrics(msgFont).maxAscent() - 4,
- from_utf8(justname), msgFont);
+ pi.pain.text(x1 + 6, y -
theFontMetrics(msgFont).maxAscent() - 4,
+ from_utf8(justname), msgFont);
}
// Print the message.
docstring const msg = statusMessage(params_, loader_.status());
if (!msg.empty()) {
msgFont.setSize(FONT_SIZE_TINY);
- pi.pain.text(x + Inset::TEXT_TO_INSET_OFFSET + 6,
- y - 4, msg, msgFont);
+ pi.pain.text(x1 + 6, y - 4, msg, msgFont);
}
}
+ pi.change_.paintCue(pi, x1, y1, x1 + w, y1 + h);
}