summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2024-08-02 15:09:54 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2024-08-03 23:32:32 +0200
commit2bf3cada925ca49e3ac6a249ec6c342954739986 (patch)
treead07f3827d7b8e3daf12cb63d7ecf78e3f45850f /svx
parent7f50f18b0fc1e9d52bf2d8f929be8c5e4518ced8 (diff)
tdf#153343 Show settings for the actual default font in control properties
Since commit ea36e0502c0bc381577cfa1b1a7fedf0f05d1d72 Date: Tue Oct 4 12:42:33 2022 +0100 tdf#150786 use a 'standard' theme for form controls , form controls in Writer/Calc/Impress documents are supposed to no longer make use of the system style, but use style settings independent of the platform and system style/theme. Edits in forms actually use the standard font (set in `ImplStyleData::SetStandardStyles`) by default since that commit. However, the font dialog in the control properties was still showing data for the application default font that depends on the system style for font attributes not explicitly set for the control, which was incorrect and inconsistent with the visual appearance of the font actually used. Take `PROPERTY_STANDARD_THEME` introduced in the above-mentioned commit into account for the dialog as well when deciding what default font to use. Add inline comments that the 2 places setting and making assumptions about the default style of controls need to be kept in sync. With this in place, the actually used font height of 8 (as set in `ImplStyleData::SetStandardStyles`) is now displayed in the dialog for a newly inserted edit in Writer instead of something dependent on the style (e.g. 10 for the kf5 VCL plugin with the Breeze style in use, or 9 for the qt6 VCL plugin with the Fusion style). For the font family, the dialog now shows "Segoe UI;Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface User;Geneva;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans Serif" (and "This font has not been installed. The closest available font will be used.") instead of "Noto Sans", which seems a bit odd, but is presumably "correct" based on the standard style font. (In order to change that, it would potentially be necessary to adjust what style settings are set in the "standard style settings" for controls.) Change-Id: I1fbee69fdcd6f73a126df64294eb1bcc44078642 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171426 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins (cherry picked from commit 7247f3ad59d64c85dc891bd5195b83c714ce1ce4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171410 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/fmcontrollayout.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 8368070a754c..e54bf5433ba2 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -271,7 +271,7 @@ namespace svxform
}
// the font (only if we use the document's ref devices for rendering control text, otherwise, the
- // default font of VCL controls is assumed to be fine)
+ // default font from application or standard style is assumed to be fine)
if ( useDocumentReferenceDevice( _eDocType )
&& xPSI->hasPropertyByName( FM_PROP_FONT )
)