anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove lyxerr statement; cosmetics.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8680 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2004-04-20 08:42:10 +00:00
parent 47c864967f
commit 66cd8361ff
2 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/ChangeLog
View File

@ -1,3 +1,9 @@
2004-04-20 Angus Leeming <leeming@lyx.org>
* render_preview.C (startLoading): remove lyxerr statement.
(draw): cosmetics.
(getPreviewLoader): new helper function.
2004-04-19 Angus Leeming <leeming@lyx.org>
* insetexternal.C:

60
src/insets/render_preview.C
View File

@ -14,7 +14,6 @@
#include "insets/inset.h"
#include "BufferView.h"
#include "debug.h"
#include "dimension.h"
#include "gettext.h"
#include "LColor.h"
@ -68,13 +67,19 @@ auto_ptr<RenderBase> RenderPreview::clone(InsetBase const * inset) const
namespace {
graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer)
{
graphics::Previews const & previews = graphics::Previews::get();
return previews.loader(buffer);
}
string const statusMessage(BufferView const * bv, string const & snippet)
{
BOOST_ASSERT(bv && bv->buffer());
Buffer const & buffer = *bv->buffer();
graphics::Previews const & previews = graphics::Previews::get();
graphics::PreviewLoader const & loader = previews.loader(buffer);
graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
graphics::PreviewLoader::Status const status = loader.status(snippet);
string message;
@ -100,8 +105,7 @@ string const statusMessage(BufferView const * bv, string const & snippet)
graphics::PreviewImage const *
RenderPreview::getPreviewImage(Buffer const & buffer) const
{
graphics::Previews & previews = graphics::Previews::get();
graphics::PreviewLoader & loader = previews.loader(buffer);
graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
return loader.preview(snippet_);
}
@ -139,25 +143,29 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
graphics::PreviewImage const * const pimage =
getPreviewImage(*pi.base.bv->buffer());
graphics::Image const * const image = pimage ? pimage->image() : 0;
if (pimage && pimage->image()) {
if (image) {
pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(),
*(pimage->image()));
return;
*image);
} else {
int const offset = InsetOld::TEXT_TO_INSET_OFFSET;
pi.pain.rectangle(x + offset,
y - dim_.asc,
dim_.wid - 2 * offset,
dim_.asc + dim_.des,
LColor::foreground);
LyXFont font(pi.base.font);
font.setFamily(LyXFont::SANS_FAMILY);
font.setSize(LyXFont::SIZE_FOOTNOTE);
pi.pain.text(x + offset + 6,
y - font_metrics::maxAscent(font) - 4,
statusMessage(pi.base.bv, snippet_), font);
}
pi.pain.rectangle(x + InsetOld::TEXT_TO_INSET_OFFSET,
y - dim_.asc,
dim_.wid - 2 * InsetOld::TEXT_TO_INSET_OFFSET,
dim_.asc + dim_.des,
LColor::foreground);
LyXFont font(pi.base.font);
font.setFamily(LyXFont::SANS_FAMILY);
font.setSize(LyXFont::SIZE_FOOTNOTE);
pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,
y - font_metrics::maxAscent(font) - 4,
statusMessage(pi.base.bv, snippet_), font);
}
@ -166,10 +174,8 @@ void RenderPreview::startLoading(Buffer const & buffer) const
if (status() == LyXRC::PREVIEW_OFF || snippet_.empty())
return;
graphics::Previews & previews = graphics::Previews::get();
graphics::PreviewLoader & loader = previews.loader(buffer);
graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
loader.startLoading();
lyxerr << "RenderPreview::startLoading: " << snippet_ << std::endl;
}
@ -179,8 +185,7 @@ void RenderPreview::addPreview(string const & latex_snippet,
if (status() == LyXRC::PREVIEW_OFF)
return;
graphics::Previews & previews = graphics::Previews::get();
graphics::PreviewLoader & loader = previews.loader(buffer);
graphics::PreviewLoader & loader = getPreviewLoader(buffer);
addPreview(latex_snippet, loader);
}
@ -215,8 +220,7 @@ void RenderPreview::removePreview(Buffer const & buffer)
if (snippet_.empty())
return;
graphics::Previews & previews = graphics::Previews::get();
graphics::PreviewLoader & loader = previews.loader(buffer);
graphics::PreviewLoader & loader = getPreviewLoader(buffer);
loader.remove(snippet_);
snippet_.erase();
}