diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-18 16:11:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-18 16:11:03 (GMT) |
| commit | 96e0f171dc799d6c736b52f00548ac65f8612a0c (patch) | |
| tree | e71d62f24f690ffcf49b1509d256cc538c1ebea0 /tests/font.test | |
| parent | e91354a1f438857414146b91cc7bed3ed9e22643 (diff) | |
| parent | 3edf85a73eca0f7ca5925e9b6575ef31c5ce6a5b (diff) | |
| download | tk-96e0f171dc799d6c736b52f00548ac65f8612a0c.zip tk-96e0f171dc799d6c736b52f00548ac65f8612a0c.tar.gz tk-96e0f171dc799d6c736b52f00548ac65f8612a0c.tar.bz2 | |
Merge 9.0
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 { |