Tk Source Code

Check-in [361ddf77]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:When running textDisp.test on Aqua use Courier as the fixed font since Courier New has different metrics.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 361ddf772e8d314a21093df3811f9403814adddc50fbab1f474cb0b6a57108d8
User & Date: culler 2019-05-28 13:41:28.731
Context
2019-06-01
18:11
In aqua, add contrasting field backgrounds and focus rings to dark mode ttk::entry widgets. check-in: 56e8b684 user: culler tags: trunk
2019-05-28
13:41
When running textDisp.test on Aqua use Courier as the fixed font since Courier New has different metrics. check-in: 361ddf77 user: culler tags: trunk
2019-05-27
21:16
Merge 8.6 check-in: afffab4b user: jan.nijtmans tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to tests/textDisp.test.
37
38
39
40
41
42
43







44

45
46
47
48
49
50
51
# because some window managers don't allow the overall width of a window
# to get very narrow.

catch {destroy .f .t}
frame .f -width 100 -height 20
pack .f -side left








set fixedFont {"Courier New" -12}

# 15 on XP, 13 on Solaris 8
set fixedHeight [font metrics $fixedFont -linespace]
# 7 on all platforms
set fixedWidth [font measure $fixedFont m]
# 12 on XP
set fixedAscent [font metrics $fixedFont -ascent]
set fixedDiff [expr {$fixedHeight - 13}] ;# 2 on XP







>
>
>
>
>
>
>
|
>







37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
# because some window managers don't allow the overall width of a window
# to get very narrow.

catch {destroy .f .t}
frame .f -width 100 -height 20
pack .f -side left

# On macOS the font "Courier New" has different metrics than "Courier",
# and this causes tests 20.1 - 20.5 to fail.  So we use "Courier" as the
# fixed font for testing on Aqua.

if {[tk windowingsystem] eq "aqua"} {
   set fixedFont {Courier -12}
} else {
  set fixedFont {"Courier New" -12}
}
# 15 on XP, 13 on Solaris 8
set fixedHeight [font metrics $fixedFont -linespace]
# 7 on all platforms
set fixedWidth [font measure $fixedFont m]
# 12 on XP
set fixedAscent [font metrics $fixedFont -ascent]
set fixedDiff [expr {$fixedHeight - 13}] ;# 2 on XP