diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2022-10-19 11:20:19 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-11-27 10:40:17 +0100 |
commit | a22047f148c45d34c5ce08d2d9011237287b673f (patch) | |
tree | 6ead965e6db6c0d5ecb4cd9721f6e18aa3ad6402 /vcl | |
parent | ae2d1315766581259756c819f0227270d344f4d4 (diff) |
vcl: test getting glyph boundary rect from LogicalFontInstance
MacOS produces a slightly different glyph height.
Quoting from Khaled in dev IRC:
"Currently GetGlyphBoundRect() calls different platform-specific
implementations on each platform, so even with the same font it is
possible to get some difference. So my suggestion is to use a large font
size and allow for some fuzziness".
Consequently I'm using a 110pt font, and taking into account some
fuzziness.
Change-Id: I0dace6bfa0d1f4e6f3b8852e957d2d518d37795b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143322
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@aliftype.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/CppunitTest_vcl_font.mk | 5 | ||||
-rw-r--r-- | vcl/qa/cppunit/logicalfontinstance.cxx | 64 |
2 files changed, 69 insertions, 0 deletions
diff --git a/vcl/CppunitTest_vcl_font.mk b/vcl/CppunitTest_vcl_font.mk index 891352508a1c..813ab1c9c009 100644 --- a/vcl/CppunitTest_vcl_font.mk +++ b/vcl/CppunitTest_vcl_font.mk @@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_font, \ vcl/qa/cppunit/physicalfontfacecollection \ vcl/qa/cppunit/physicalfontfamily \ vcl/qa/cppunit/physicalfontcollection \ + vcl/qa/cppunit/logicalfontinstance \ )) $(eval $(call gb_CppunitTest_use_externals,vcl_font,\ @@ -56,4 +57,8 @@ $(eval $(call gb_CppunitTest_use_components,vcl_font,\ $(eval $(call gb_CppunitTest_use_configuration,vcl_font)) +$(eval $(call gb_CppunitTest_use_more_fonts,vcl_font)) + +$(eval $(call gb_CppunitTest_set_non_application_font_use,vcl_font,abort)) + # vim: set noet sw=4 ts=4: diff --git a/vcl/qa/cppunit/logicalfontinstance.cxx b/vcl/qa/cppunit/logicalfontinstance.cxx new file mode 100644 index 000000000000..2a7a5c83ac27 --- /dev/null +++ b/vcl/qa/cppunit/logicalfontinstance.cxx @@ -0,0 +1,64 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <sal/config.h> + +#include <test/bootstrapfixture.hxx> +#include <cppunit/TestAssert.h> + +#include <vcl/virdev.hxx> +#include <vcl/font.hxx> + +#include <font/LogicalFontInstance.hxx> + +#include <memory> + +class VclLogicalFontInstanceTest : public test::BootstrapFixture +{ +public: + VclLogicalFontInstanceTest() + : BootstrapFixture(true, false) + { + } + + void testglyphboundrect(); + + CPPUNIT_TEST_SUITE(VclLogicalFontInstanceTest); + CPPUNIT_TEST(testglyphboundrect); + + CPPUNIT_TEST_SUITE_END(); +}; + +void VclLogicalFontInstanceTest::testglyphboundrect() +{ + ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT); + device->SetOutputSizePixel(Size(1000, 1000)); + device->SetFont(vcl::Font("Liberation Sans", Size(0, 110))); + + const LogicalFontInstance* pFontInstance = device->GetFontInstance(); + + tools::Rectangle aBoundRect; + const auto LATIN_SMALL_LETTER_B = 0x0062; + pFontInstance->GetGlyphBoundRect(pFontInstance->GetGlyphIndex(LATIN_SMALL_LETTER_B), aBoundRect, + false); + + const tools::Long nExpectedX = 7; + const tools::Long nExpectedY = -80; + + CPPUNIT_ASSERT_EQUAL_MESSAGE("x of glyph is wrong", nExpectedX, aBoundRect.getX()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("y of glyph is wrong", nExpectedY, aBoundRect.getY()); + CPPUNIT_ASSERT_MESSAGE("height of glyph of wrong", + aBoundRect.GetWidth() == 50 || aBoundRect.GetWidth() == 51); + CPPUNIT_ASSERT_MESSAGE("width of glyph of wrong", + aBoundRect.GetHeight() == 82 || aBoundRect.GetHeight() == 83); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(VclLogicalFontInstanceTest); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |