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

Remove horizontal spacing around previews

Browse Source 
This concerns the preview version of InsetPreview and InsetIPA.

Fixes bug #10304.
(cherry picked from commit 4ddad2f6cd)
This commit is contained in:
Jean-Marc Lasgouttes 2016-07-21 20:16:27 +02:00
parent deec55866c
commit e0730fe070
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/InsetIPA.cpp
View File

@ -151,7 +151,7 @@ void InsetIPA::reloadPreview(DocIterator const & pos) const
void InsetIPA::draw(PainterInfo & pi, int x, int y) const void InsetIPA::draw(PainterInfo & pi, int x, int y) const
{ {
if (previewState(pi.base.bv)) { if (previewState(pi.base.bv)) {
preview_->draw(pi, x + TEXT_TO_INSET_OFFSET, y); preview_->draw(pi, x, y);
setPosCache(pi, x, y); setPosCache(pi, x, y);
return; return;
} }
@ -181,15 +181,12 @@ void InsetIPA::metrics(MetricsInfo & mi, Dimension & dim) const
{ {
if (previewState(mi.base.bv)) { if (previewState(mi.base.bv)) {
preview_->metrics(mi, dim); preview_->metrics(mi, dim);
mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
dim.wid = max(dim.wid, 4); dim.wid = max(dim.wid, 4);
dim.asc = max(dim.asc, 4); dim.asc = max(dim.asc, 4);
dim.asc += TEXT_TO_INSET_OFFSET; dim.asc += TEXT_TO_INSET_OFFSET;
dim.des += 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 // insert a one pixel gap
dim.wid += 1; dim.wid += 1;
// Cache the inset dimension. // Cache the inset dimension.

5
src/insets/InsetPreview.cpp
View File

@ -138,7 +138,7 @@ void InsetPreview::draw(PainterInfo & pi, int x, int y) const
{ {
if (previewState(pi.base.bv)) { if (previewState(pi.base.bv)) {
// one pixel gap in front // 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); setPosCache(pi, x, y);
} else } else
InsetText::draw(pi, x, y); InsetText::draw(pi, x, y);
@ -167,15 +167,12 @@ void InsetPreview::metrics(MetricsInfo & mi, Dimension & dim) const
{ {
if (previewState(mi.base.bv)) { if (previewState(mi.base.bv)) {
preview_->metrics(mi, dim); preview_->metrics(mi, dim);
mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
dim.wid = max(dim.wid, 4); dim.wid = max(dim.wid, 4);
dim.asc = max(dim.asc, 4); dim.asc = max(dim.asc, 4);
dim.asc += TEXT_TO_INSET_OFFSET; dim.asc += TEXT_TO_INSET_OFFSET;
dim.des += 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 // insert a one pixel gap
dim.wid += 1; dim.wid += 1;
// Cache the inset dimension. // Cache the inset dimension.

2
status.22x
View File

@ -84,6 +84,8 @@ What's new
- Correct default font of beamer article layouts (bug 9977). - Correct default font of beamer article layouts (bug 9977).
- Remove extra whitespace around Preview and IPA insets (bug 10304).
* INTERNALS * INTERNALS