Tk Source Code

Changes On Branch tip-564
Login
Bounty program for improvements to Tcl and certain Tcl packages.

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

Changes In Branch bug-dccd82bdc7 Excluding Merge-Ins

This is equivalent to a diff from 41f71271 to a310caa1

2020-02-22
15:33
Merge implementation of TIP #564: ttk font sizes in points, which fixes [dccd82bdc7]. This follows a positive vote from the TCT. check-in: f7a65e47 user: fvogel tags: trunk
2020-02-16
12:42
Merge 8.6 check-in: cb8499e8 user: jan.nijtmans tags: trunk
2020-02-15
22:34
Merge trunk check-in: 4d08154a user: pspjuth tags: pspjuth-treeview
09:34
merge trunk check-in: dffd7c07 user: dkf tags: tip-560
2020-02-14
11:42
Merge trunk Closed-Leaf check-in: a310caa1 user: jan.nijtmans tags: bug-dccd82bdc7, tip-564
11:40
Merge trunk check-in: 976eaf12 user: jan.nijtmans tags: keysym-unicode
11:39
Merge trunk Leaf check-in: a394645c user: jan.nijtmans tags: tip-167
11:24
Merge trunk check-in: b41548a4 user: jan.nijtmans tags: revised_text, tip-466
11:23
Merge trunk check-in: 03f41b79 user: jan.nijtmans tags: tip-556
10:22
Merge trunk check-in: 2940d63c user: jan.nijtmans tags: cplusplus
10:22
Merge 8.6 check-in: 41f71271 user: jan.nijtmans tags: trunk
10:21
A few missing (internal) "const" modifiers. check-in: 32b621b3 user: jan.nijtmans tags: core-8-6-branch
2020-02-13
21:10
Merge 8.6 check-in: bd5761b5 user: jan.nijtmans tags: trunk
2020-01-26
20:13
Fix [dccd82bdc7]: ttk fonts are absolute on x11, which is very undesirable for hidpi displays check-in: b441746a user: fvogel tags: bug-dccd82bdc7, tip-564

Changes to library/ttk/fonts.tcl.

49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
...
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
#	For now, assume patch #971980 applied.
#
#	"Classic" look used Helvetica bold for everything except
#	for entry widgets, which use Helvetica medium.
#	Most other toolkits use medium weight for all UI elements,
#	which is what we do now.
#
#	Font size specified in pixels on X11, not points.
#	This is Theoretically Wrong, but in practice works better; using
#	points leads to huge inconsistencies across different servers.
#

namespace eval ttk {

variable tip145 [catch {font create TkDefaultFont}]
catch {font create TkTextFont}
catch {font create TkHeadingFont}
catch {font create TkCaptionFont}
................................................................................
	if {![catch {tk::pkgconfig get fontsystem} F(fs)] && $F(fs) eq "xft"} {
	    set F(family) "sans-serif"
	    set F(fixed)  "monospace"
	} else {
	    set F(family) "Helvetica"
	    set F(fixed)  "courier"
	}
	set F(size) -12
	set F(ttsize) -10
	set F(capsize) -14
	set F(fixedsize) -12

	font configure TkDefaultFont -family $F(family) -size $F(size)
	font configure TkTextFont    -family $F(family) -size $F(size)
	font configure TkHeadingFont -family $F(family) -size $F(size) \
			-weight bold
	font configure TkCaptionFont -family $F(family) -size $F(capsize) \
			-weight bold






<
<
<
<







 







|
|
|
|







49
50
51
52
53
54
55




56
57
58
59
60
61
62
...
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
#	For now, assume patch #971980 applied.
#
#	"Classic" look used Helvetica bold for everything except
#	for entry widgets, which use Helvetica medium.
#	Most other toolkits use medium weight for all UI elements,
#	which is what we do now.
#





namespace eval ttk {

variable tip145 [catch {font create TkDefaultFont}]
catch {font create TkTextFont}
catch {font create TkHeadingFont}
catch {font create TkCaptionFont}
................................................................................
	if {![catch {tk::pkgconfig get fontsystem} F(fs)] && $F(fs) eq "xft"} {
	    set F(family) "sans-serif"
	    set F(fixed)  "monospace"
	} else {
	    set F(family) "Helvetica"
	    set F(fixed)  "courier"
	}
	set F(size) 10
	set F(ttsize) 9
	set F(capsize) 12
	set F(fixedsize) 10

	font configure TkDefaultFont -family $F(family) -size $F(size)
	font configure TkTextFont    -family $F(family) -size $F(size)
	font configure TkHeadingFont -family $F(family) -size $F(size) \
			-weight bold
	font configure TkCaptionFont -family $F(family) -size $F(capsize) \
			-weight bold