diff options
| author | fvogel <fvogelnew1@free.fr> | 2023-11-15 19:55:39 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2023-11-15 19:55:39 (GMT) |
| commit | 3b704f9324a447a8eb37aee870bb3f1a9d8a7426 (patch) | |
| tree | 26c5f297cab740acf192a960c26912c461b095fa /tests/font.test | |
| parent | 8dfcb7233a9848c90ecb86478b75bf92cbc72078 (diff) | |
| parent | 5b7abe20b40cbe5307cb458ec1af39b1f47346f3 (diff) | |
| download | tk-3b704f9324a447a8eb37aee870bb3f1a9d8a7426.zip tk-3b704f9324a447a8eb37aee870bb3f1a9d8a7426.tar.gz tk-3b704f9324a447a8eb37aee870bb3f1a9d8a7426.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 56e2e50..9bf6d65 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 { |