From e2d6ecff992f8bce03d171a54567644892b87868 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Thu, 17 Dec 2009 15:25:55 +0000 Subject: [PATCH] Compute the font_scaling_factor every time a preview is created (we can afford a few multiplications I guess). Now, the newly generated previews use the possibly updated zoom, dpi and preview_scale_factor. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32563 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/graphics/PreviewLoader.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp index 58fb336294..f54fb6bc92 100644 --- a/src/graphics/PreviewLoader.cpp +++ b/src/graphics/PreviewLoader.cpp @@ -243,8 +243,6 @@ private: PreviewLoader & parent_; /// Buffer const & buffer_; - /// - double font_scaling_factor_; /// We don't own this static lyx::Converter const * pconverter_; @@ -387,14 +385,8 @@ namespace lyx { namespace graphics { PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b) - : parent_(p), buffer_(b), font_scaling_factor_(0.0) + : parent_(p), buffer_(b) { - font_scaling_factor_ = 0.01 * lyxrc.dpi * lyxrc.zoom * - lyxrc.preview_scale_factor; - - LYXERR(Debug::GRAPHICS, "The font scaling factor is " - << font_scaling_factor_); - if (!pconverter_){ if (b.params().encoding().package() == Encoding::japanese) pconverter_ = setConverter("lyxpreview-platex"); @@ -590,11 +582,14 @@ void PreviewLoader::Impl::startLoading() return; } + double font_scaling_factor = 0.01 * lyxrc.dpi * lyxrc.zoom + * lyxrc.preview_scale_factor; + // The conversion command. ostringstream cs; cs << pconverter_->command << ' ' << pconverter_->to << ' ' << quoteName(latexfile.toFilesystemEncoding()) << ' ' - << int(font_scaling_factor_) << ' ' + << int(font_scaling_factor) << ' ' << theApp()->hexName(PreviewLoader::foregroundColor()) << ' ' << theApp()->hexName(PreviewLoader::backgroundColor()); -- 2.39.2