diff options
author | fvogel <fvogelnew1@free.fr> | 2023-11-15 19:55:23 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2023-11-15 19:55:23 (GMT) |
commit | 5b7abe20b40cbe5307cb458ec1af39b1f47346f3 (patch) | |
tree | 6b2206cdcaf41f5a4548efc27016547b9b295260 /tests/font.test | |
parent | 77f93393c12a891b1f70d1d192302b41fe82a5a8 (diff) | |
parent | 26f4d2bf8b589ae78776a8228188384588ffd24c (diff) | |
download | tk-5b7abe20b40cbe5307cb458ec1af39b1f47346f3.zip tk-5b7abe20b40cbe5307cb458ec1af39b1f47346f3.tar.gz tk-5b7abe20b40cbe5307cb458ec1af39b1f47346f3.tar.bz2 |
Fix [61550f38bf]: font actual returns wrong font size with Xft.
Diffstat (limited to 'tests/font.test')
-rw-r--r-- | tests/font.test | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/font.test b/tests/font.test index 69d3b15..d57b998 100644 --- a/tests/font.test +++ b/tests/font.test @@ -2339,14 +2339,15 @@ test font-43.1 {FieldSpecified procedure: specified vs. non-specified} -body { } -result [font actual {times 0} -family] -test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntu -setup { +test font-44.1 {TkFontGetPixels: size < 0} -setup { set oldscale [tk scaling] } -body { + set oldsize [expr {-(-12.0 / $oldscale)}] tk scaling 0.5 - font actual {times -12} -size + expr {round([font actual {times -12} -size] / $oldscale * 0.5) - round($oldsize) == 0} } -cleanup { tk scaling $oldscale -} -result 24 +} -result 1 test font-44.2 {TkFontGetPoints: size >= 0} -constraints {noExceed haveTimes12Font} -setup { set oldscale [tk scaling] } -body { |