Skip to content

Commit 75eb2af

Browse files
Mark Hillspaulusmack
authored andcommitted
gitk: Remove forced use of sans-serif font
The X resources set using uifont cover this case. Signed-off-by: Mark Hills <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent decd0a1 commit 75eb2af

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

gitk

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10531,7 +10531,6 @@ proc mkfontdisp {font top which} {
1053110531
set fontpref($font) [set $font]
1053210532
${NS}::button $top.${font}but -text $which \
1053310533
-command [list choosefont $font $which]
10534-
if {!$use_ttk} {$top.${font}but configure -font optionfont}
1053510534
${NS}::label $top.$font -relief flat -font $font \
1053610535
-text $fontattr($font,family) -justify left
1053710536
grid x $top.${font}but $top.$font -sticky w
@@ -10794,15 +10793,6 @@ proc doprefs {} {
1079410793
mkfontdisp textfont $top [mc "Diff display font"]
1079510794
mkfontdisp uifont $top [mc "User interface font"]
1079610795

10797-
if {!$use_ttk} {
10798-
foreach w {maxpctl maxwidthl showlocal autoselect tabstopl ntag
10799-
ldiff lattr extdifff.l extdifff.b bgbut fgbut
10800-
diffoldbut diffnewbut hunksepbut markbgbut selbgbut
10801-
want_ttk ttk_note} {
10802-
$top.$w configure -font optionfont
10803-
}
10804-
}
10805-
1080610796
${NS}::frame $top.buts
1080710797
${NS}::button $top.buts.ok -text [mc "OK"] -command prefsok -default active
1080810798
${NS}::button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
@@ -11414,8 +11404,6 @@ namespace import ::msgcat::mc
1141411404

1141511405
catch {source ~/.gitk}
1141611406

11417-
font create optionfont -family sans-serif -size -12
11418-
1141911407
parsefont mainfont $mainfont
1142011408
eval font create mainfont [fontflags mainfont]
1142111409
eval font create mainfontbold [fontflags mainfont 1]

0 commit comments

Comments
 (0)