From e0730fe0706b08f9b2d284696546fcccefdf5839 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 21 Jul 2016 20:16:27 +0200 Subject: [PATCH] Remove horizontal spacing around previews This concerns the preview version of InsetPreview and InsetIPA. Fixes bug #10304. (cherry picked from commit 4ddad2f6cdefcfdd873ae3d4cea8b272495f9aba) --- src/insets/InsetIPA.cpp | 9 +++------ src/insets/InsetPreview.cpp | 5 +---- status.22x | 2 ++ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/insets/InsetIPA.cpp b/src/insets/InsetIPA.cpp index 1da5a24299..c53dd65162 100644 --- a/src/insets/InsetIPA.cpp +++ b/src/insets/InsetIPA.cpp @@ -151,7 +151,7 @@ void InsetIPA::reloadPreview(DocIterator const & pos) const void InsetIPA::draw(PainterInfo & pi, int x, int y) const { if (previewState(pi.base.bv)) { - preview_->draw(pi, x + TEXT_TO_INSET_OFFSET, y); + preview_->draw(pi, x, y); setPosCache(pi, x, y); return; } @@ -181,15 +181,12 @@ void InsetIPA::metrics(MetricsInfo & mi, Dimension & dim) const { if (previewState(mi.base.bv)) { preview_->metrics(mi, dim); - mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET; - + dim.wid = max(dim.wid, 4); dim.asc = max(dim.asc, 4); - + dim.asc += TEXT_TO_INSET_OFFSET; dim.des += TEXT_TO_INSET_OFFSET; - dim.wid += TEXT_TO_INSET_OFFSET; - dim.wid += TEXT_TO_INSET_OFFSET; // insert a one pixel gap dim.wid += 1; // Cache the inset dimension. diff --git a/src/insets/InsetPreview.cpp b/src/insets/InsetPreview.cpp index 7577741175..bcccd2bb0f 100644 --- a/src/insets/InsetPreview.cpp +++ b/src/insets/InsetPreview.cpp @@ -138,7 +138,7 @@ void InsetPreview::draw(PainterInfo & pi, int x, int y) const { if (previewState(pi.base.bv)) { // one pixel gap in front - preview_->draw(pi, x + 1 + TEXT_TO_INSET_OFFSET, y); + preview_->draw(pi, x + 1, y); setPosCache(pi, x, y); } else InsetText::draw(pi, x, y); @@ -167,15 +167,12 @@ void InsetPreview::metrics(MetricsInfo & mi, Dimension & dim) const { if (previewState(mi.base.bv)) { preview_->metrics(mi, dim); - mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET; dim.wid = max(dim.wid, 4); dim.asc = max(dim.asc, 4); dim.asc += TEXT_TO_INSET_OFFSET; dim.des += TEXT_TO_INSET_OFFSET; - dim.wid += TEXT_TO_INSET_OFFSET; - dim.wid += TEXT_TO_INSET_OFFSET; // insert a one pixel gap dim.wid += 1; // Cache the inset dimension. diff --git a/status.22x b/status.22x index 412b7c6cc2..ea8d263339 100644 --- a/status.22x +++ b/status.22x @@ -84,6 +84,8 @@ What's new - Correct default font of beamer article layouts (bug 9977). +- Remove extra whitespace around Preview and IPA insets (bug 10304). + * INTERNALS -- 2.39.5