From 6fc6d7e010ddcd72d6f5a605b7fb05f5037fe774 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 14 Oct 2003 13:54:16 +0000 Subject: [PATCH] Only draw the preview when previews are activated. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7921 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 4 ++++ src/insets/insetinclude.C | 4 ++-- src/mathed/ChangeLog | 5 +++++ src/mathed/formula.C | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 90585a65e9..c8fe12abc0 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2003-10-14 Angus Leeming + + * insetinclude.C (metrics, draw): only draw the preview when previews + are activated. 2003-10-14 André Pönitz diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index 7bd4fa7b95..1a3a5090c2 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -518,7 +518,7 @@ void InsetInclude::fillWithBibKeys(Buffer const & buffer, void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const { - if (preview_->previewReady()) { + if (RenderPreview::activated() && preview_->previewReady()) { preview_->metrics(mi, dim); } else { if (!set_label_) { @@ -542,7 +542,7 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const { cache(pi.base.bv); - if (!preview_->previewReady()) { + if (!RenderPreview::activated() || !preview_->previewReady()) { button_.draw(pi, x + button_.box().x1, y); return; } diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index c8593558b2..f015e04706 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,8 @@ +2003-10-14 Angus Leeming + + * formula.C (metrics, draw): only draw the preview when previews + are activated. + 2003-10-13 Angus Leeming * formula.C (editing_inset): pass a pointer rather than a reference. diff --git a/src/mathed/formula.C b/src/mathed/formula.C index 932d9ac695..fb2f0a96ce 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -195,6 +195,7 @@ void InsetFormula::draw(PainterInfo & pi, int x, int y) const // The previews are drawn only when we're not editing the inset. bool const use_preview = (!editing_inset(this) && + RenderPreview::activated() && preview_->previewReady()); int const w = dim_.wid; @@ -258,6 +259,7 @@ bool InsetFormula::insetAllowed(InsetOld::Code code) const void InsetFormula::metrics(MetricsInfo & m, Dimension & dim) const { bool const use_preview = (!editing_inset(this) && + RenderPreview::activated() && preview_->previewReady()); if (use_preview) { -- 2.39.2