#include "insets/Inset.h"
#include "gettext.h"
-#include "LColor.h"
+#include "Color.h"
#include "LyX.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
using support::onlyFilename;
using std::string;
-using std::auto_ptr;
-RenderGraphic::RenderGraphic(InsetBase const * inset)
+RenderGraphic::RenderGraphic(Inset const * inset)
{
loader_.connect(boost::bind(&LyX::updateInset,
boost::cref(LyX::cref()), inset));
RenderGraphic::RenderGraphic(RenderGraphic const & other,
- InsetBase const * inset)
+ Inset const * inset)
: RenderBase(other),
loader_(other.loader_),
params_(other.params_)
}
-auto_ptr<RenderBase> RenderGraphic::clone(InsetBase const * inset) const
+RenderBase * RenderGraphic::clone(Inset const * inset) const
{
- return auto_ptr<RenderBase>(new RenderGraphic(*this, inset));
+ return new RenderGraphic(*this, inset);
}
} // namespace anon
-bool RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
+void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
{
bool image_ready = displayGraphic(params_) && readyToDisplay(loader_);
if (image_ready) {
dim.wid = loader_.image()->getWidth() +
- 2 * InsetOld::TEXT_TO_INSET_OFFSET;
+ 2 * Inset::TEXT_TO_INSET_OFFSET;
} else {
int font_width = 0;
- LyXFont msgFont(mi.base.font);
- msgFont.setFamily(LyXFont::SANS_FAMILY);
+ Font msgFont(mi.base.font);
+ msgFont.setFamily(Font::SANS_FAMILY);
// FIXME UNICODE
- docstring const justname =
+ docstring const justname =
from_utf8(onlyFilename(params_.filename.absFilename()));
if (!justname.empty()) {
- msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
+ msgFont.setSize(Font::SIZE_FOOTNOTE);
font_width = theFontMetrics(msgFont)
.width(justname);
}
docstring const msg = statusMessage(params_, loader_.status());
if (!msg.empty()) {
- msgFont.setSize(LyXFont::SIZE_TINY);
+ msgFont.setSize(Font::SIZE_TINY);
font_width = std::max(font_width,
theFontMetrics(msgFont).width(msg));
}
dim.wid = std::max(50, font_width + 15);
}
- bool const changed = dim_ != dim;
dim_ = dim;
- return changed;
}
// loaded yet, we draw just a rectangle.
if (displayGraphic(params_) && readyToDisplay(loader_)) {
- pi.pain.image(x + InsetOld::TEXT_TO_INSET_OFFSET,
+ pi.pain.image(x + Inset::TEXT_TO_INSET_OFFSET,
y - dim_.asc,
- dim_.wid - 2 * InsetOld::TEXT_TO_INSET_OFFSET,
+ dim_.wid - 2 * Inset::TEXT_TO_INSET_OFFSET,
dim_.asc + dim_.des,
*loader_.image());
} else {
- pi.pain.rectangle(x + InsetOld::TEXT_TO_INSET_OFFSET,
+ pi.pain.rectangle(x + Inset::TEXT_TO_INSET_OFFSET,
y - dim_.asc,
- dim_.wid - 2 * InsetOld::TEXT_TO_INSET_OFFSET,
+ dim_.wid - 2 * Inset::TEXT_TO_INSET_OFFSET,
dim_.asc + dim_.des,
- LColor::foreground);
+ Color::foreground);
// Print the file name.
- LyXFont msgFont = pi.base.font;
- msgFont.setFamily(LyXFont::SANS_FAMILY);
+ Font msgFont = pi.base.font;
+ msgFont.setFamily(Font::SANS_FAMILY);
string const justname = onlyFilename(params_.filename.absFilename());
if (!justname.empty()) {
- msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
- pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,
+ msgFont.setSize(Font::SIZE_FOOTNOTE);
+ pi.pain.text(x + Inset::TEXT_TO_INSET_OFFSET + 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(LyXFont::SIZE_TINY);
- pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,
+ msgFont.setSize(Font::SIZE_TINY);
+ pi.pain.text(x + Inset::TEXT_TO_INSET_OFFSET + 6,
y - 4, msg, msgFont);
}
}