Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix incorrect font sizes (#321)

Browse Source 
Recently, when chasing the font size differences between the wayland and xcb Qt backends, I ended up normalizing on the wayland sizing when bypassing the backend's font metrics calculation (#272).  Unfortunately, the wayland backend was not rendering the font sizes correctly, and it was a mistake to duplicate its behavior. 

* Assume a virtual DPI of 72 pixels/in instead of 96 when compulting font size
  - Based on testing, this produces the correct font size
  - Updated reference labels.
* No longer need to scale fonts when importing glabels-3 files.
  - The glabels-3 font sizes were correct afterall!  (#306)
  - No longer need to compensate for scale factor in unit tests when importing glabels-3 files.
This commit is contained in:
Jaye Evins
2026-03-27 15:47:46 -04:00
committed by GitHub
parent 06675f8314
commit d1ee78e58a
5 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/unit_tests/TestXmlLabel.cpp
+3 -9
View File
@@ -60,12 +60,6 @@ using namespace glabels::barcode;
using namespace glabels::merge;
namespace
{
const double FONT_SCALE_FACTOR {0.75};
}
void TestXmlLabel::initTestCase()
{
QCoreApplication::setOrganizationName( glabels::model::Version::ORGANIZATION_NAME );
@@ -548,7 +542,7 @@ void TestXmlLabel::parser_3ReadFile()
QCOMPARE( modelTextObject0->shadow(), false );
QCOMPARE( modelTextObject0->text(), QString( "Hello, my name is" ) );
QCOMPARE( modelTextObject0->fontFamily(), QString( "Sans" ) );
QCOMPARE( modelTextObject0->fontSize(), 16 * FONT_SCALE_FACTOR );
QCOMPARE( modelTextObject0->fontSize(), 16 );
QCOMPARE( modelTextObject0->fontWeight(), QFont::Bold );
QCOMPARE( modelTextObject0->fontItalicFlag(), false );
QCOMPARE( modelTextObject0->textLineSpacing(), 1.0 );
@@ -566,7 +560,7 @@ void TestXmlLabel::parser_3ReadFile()
QCOMPARE( modelTextObject1->shadow(), false );
QCOMPARE( modelTextObject1->text(), QString( "${Name}" ) );
QCOMPARE( modelTextObject1->fontFamily(), QString( "Sans" ) );
QCOMPARE( modelTextObject1->fontSize(), 20 * FONT_SCALE_FACTOR );
QCOMPARE( modelTextObject1->fontSize(), 20 );
QCOMPARE( modelTextObject1->fontWeight(), QFont::Normal );
QCOMPARE( modelTextObject1->fontItalicFlag(), false );
QCOMPARE( modelTextObject1->textLineSpacing(), 1.0 );
@@ -584,7 +578,7 @@ void TestXmlLabel::parser_3ReadFile()
QCOMPARE( modelTextObject2->shadow(), false );
QCOMPARE( modelTextObject2->text(), QString( "Department: ${Department}" ) );
QCOMPARE( modelTextObject2->fontFamily(), QString( "Sans" ) );
QCOMPARE( modelTextObject2->fontSize(), 11 * FONT_SCALE_FACTOR );
QCOMPARE( modelTextObject2->fontSize(), 11 );
QCOMPARE( modelTextObject2->fontWeight(), QFont::Normal );
QCOMPARE( modelTextObject2->fontItalicFlag(), false );
QCOMPARE( modelTextObject2->textLineSpacing(), 1.0 );