From 37d6dbd1b8f90604d58a782f7af0af1d5c8c1f89 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 29 Oct 2022 11:37:06 +0200 Subject: vcl: rename CoreTextStyle to CoreTextFont MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Everywhere else we call them fonts. Change-Id: I70ef5957e9fb4fd03588cf23a255480ad021e083 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142010 Tested-by: Jenkins Reviewed-by: خالد حسني --- vcl/skia/osx/gdiimpl.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vcl/skia') diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx index fef8b54e3db4..604c297c6fdd 100644 --- a/vcl/skia/osx/gdiimpl.cxx +++ b/vcl/skia/osx/gdiimpl.cxx @@ -277,8 +277,8 @@ bool AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n void AquaSkiaSalGraphicsImpl::drawTextLayout(const GenericSalLayout& rLayout, bool bSubpixelPositioning) { - const CoreTextStyle& rStyle = *static_cast(&rLayout.GetFont()); - const vcl::font::FontSelectPattern& rFontSelect = rStyle.GetFontSelectPattern(); + const CoreTextFont& rFont = *static_cast(&rLayout.GetFont()); + const vcl::font::FontSelectPattern& rFontSelect = rFont.GetFontSelectPattern(); int nHeight = rFontSelect.mnHeight; int nWidth = rFontSelect.mnWidth ? rFontSelect.mnWidth : nHeight; if (nWidth == 0 || nHeight == 0) @@ -302,12 +302,12 @@ void AquaSkiaSalGraphicsImpl::drawTextLayout(const GenericSalLayout& rLayout, } CTFontRef pFont - = static_cast(CFDictionaryGetValue(rStyle.GetStyleDict(), kCTFontAttributeName)); + = static_cast(CFDictionaryGetValue(rFont.GetStyleDict(), kCTFontAttributeName)); sk_sp typeface = SkMakeTypefaceFromCTFont(pFont); SkFont font(typeface); font.setSize(nHeight); - // font.setScaleX(rStyle.mfFontStretch); TODO - if (rStyle.mbFauxBold) + // font.setScaleX(rFont.mfFontStretch); TODO + if (rFont.mbFauxBold) font.setEmbolden(true); SkFont::Edging ePreferredAliasing -- cgit