From fdd09d6f51491059f3def7f6c3d11167d6f5462c Mon Sep 17 00:00:00 2001 From: Guillaume Munch Date: Sun, 20 Nov 2016 23:41:36 +0100 Subject: [PATCH] Let math mu skips scale with zoom --- src/mathed/MathSupport.cpp | 23 +++++++---------------- src/mathed/MathSupport.h | 8 +++++--- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp index 16fbbcd4be..222807bba4 100644 --- a/src/mathed/MathSupport.cpp +++ b/src/mathed/MathSupport.cpp @@ -15,6 +15,7 @@ #include "InsetMathFont.h" #include "InsetMathSymbol.h" +#include "Length.h" #include "MathData.h" #include "MathParser.h" #include "MathStream.h" @@ -533,25 +534,15 @@ int mathed_font_em(FontInfo const & font) * above. */ -int mathed_thinmuskip(FontInfo font) +int mathed_mu(FontInfo const & font, double mu) { - font.setFamily(SYMBOL_FAMILY); - return support::iround(3.0 / 18 * theFontMetrics(font).em()); + MetricsBase mb(nullptr, font); + return Length(mu, Length::MU).inPixels(mb); } - -int mathed_medmuskip(FontInfo font) -{ - font.setFamily(SYMBOL_FAMILY); - return support::iround(4.0 / 18 * theFontMetrics(font).em()); -} - - -int mathed_thickmuskip(FontInfo font) -{ - font.setFamily(SYMBOL_FAMILY); - return support::iround(5.0 / 18 * theFontMetrics(font).em()); -} +int mathed_thinmuskip(FontInfo const & font) { return mathed_mu(font, 3.0); } +int mathed_medmuskip(FontInfo const & font) { return mathed_mu(font, 4.0); } +int mathed_thickmuskip(FontInfo const & font) { return mathed_mu(font, 5.0); } int mathed_char_width(FontInfo const & font, char_type c) diff --git a/src/mathed/MathSupport.h b/src/mathed/MathSupport.h index b7e3c7c39b..87f824dc16 100644 --- a/src/mathed/MathSupport.h +++ b/src/mathed/MathSupport.h @@ -31,11 +31,13 @@ class latexkeys; int mathed_font_em(FontInfo const &); -int mathed_thinmuskip(FontInfo font); +int mathed_mu(FontInfo const & font, double mu); -int mathed_medmuskip(FontInfo font); +int mathed_thinmuskip(FontInfo const & font); -int mathed_thickmuskip(FontInfo font); +int mathed_medmuskip(FontInfo const & font); + +int mathed_thickmuskip(FontInfo const & font); int mathed_char_width(FontInfo const &, char_type c); -- 2.39.2