Skip to content

Fix font-size-adjust calculation from QTextDocument

Alvin Wong requested to merge alvinwong/krita:alvin/bug470782 into master

The previous calculation was wrong, causing text to be stuck in a specific size regardless of the actual font size setting in the rich text editor.

When trying to fix it, I found that QFontMetricsF gives bogus values for xHeight (at least on Windows) so it cannot be used. I ended up calculating the value by reading the parameters with FreeType. If the font does not have xHeight, then we just don't write the property.

The value of this property is calculated so that the font size of the primary font is the same as when this property is not set.

BUG:470782

Test Plan

  1. Create a multiline text object.
  2. Change the font size in the rich text editor, then observe that the font size on canvas is updated.
  3. Switch to the SVG editor and remove the font-size-adjust CSS property, then observe that the font size remains the same.

Formalities Checklist

  • I confirmed this builds.
  • I confirmed Krita ran and the relevant functions work.
  • I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
  • I made sure my commits build individually and have good descriptions as per KDE guidelines.
  • I made sure my code conforms to the standards set in the HACKING file.
  • I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.

Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build. If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.

Merge request reports