Fossil SCM
Tk diff: Just stick with default fonts (with an exception for Windows).
Commit
7e9c7c04540c0526d851cad79bb1ac6c152c782c
Parent
13161f39aa105b9…
1 file changed
+2
-10
+2
-10
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -617,12 +617,10 @@ | ||
| 617 | 617 | @ HR_PAD_TOP 4 |
| 618 | 618 | @ HR_PAD_BTM 8 |
| 619 | 619 | @ FN_BG #444444 |
| 620 | 620 | @ FN_FG #ffffff |
| 621 | 621 | @ FN_PAD 5 |
| 622 | -@ FONTS {{DejaVu Sans Mono} Consolas Monaco} | |
| 623 | -@ FONT_SIZE 9 | |
| 624 | 622 | @ PADX 5 |
| 625 | 623 | @ WIDTH 80 |
| 626 | 624 | @ HEIGHT 45 |
| 627 | 625 | @ LB_HEIGHT 25 |
| 628 | 626 | @ } |
| @@ -868,21 +866,15 @@ | ||
| 868 | 866 | @ $txt tag config fn -background $CFG(FN_BG) -foreground $CFG(FN_FG) \ |
| 869 | 867 | @ -justify center |
| 870 | 868 | @ } |
| 871 | 869 | @ text .mkr |
| 872 | 870 | @ |
| 873 | -@ font create mono -family courier -size $CFG(FONT_SIZE) | |
| 874 | -@ foreach font $CFG(FONTS) { | |
| 875 | -@ if {[lsearch -exact [font families] $font] != -1} { | |
| 876 | -@ font config mono -family $font | |
| 877 | -@ break | |
| 878 | -@ } | |
| 879 | -@ } | |
| 880 | 871 | @ foreach c [cols] { |
| 881 | 872 | @ set keyPrefix [string toupper [colType $c]]_COL_ |
| 873 | +@ if {$tcl_platform(platform)=="windows"} {$c config -font {courier 9}} | |
| 882 | 874 | @ $c config -bg $CFG(${keyPrefix}BG) -fg $CFG(${keyPrefix}FG) -borderwidth 0 \ |
| 883 | -@ -font mono -padx $CFG(PADX) -yscroll sync-y | |
| 875 | +@ -padx $CFG(PADX) -yscroll sync-y | |
| 884 | 876 | @ $c tag config hr -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \ |
| 885 | 877 | @ -foreground $CFG(HR_FG) |
| 886 | 878 | @ $c tag config fn -spacing1 $CFG(FN_PAD) -spacing3 $CFG(FN_PAD) |
| 887 | 879 | @ bindtags $c ". $c Text all" |
| 888 | 880 | @ bind $c <1> {focus %W} |
| 889 | 881 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -617,12 +617,10 @@ | |
| 617 | @ HR_PAD_TOP 4 |
| 618 | @ HR_PAD_BTM 8 |
| 619 | @ FN_BG #444444 |
| 620 | @ FN_FG #ffffff |
| 621 | @ FN_PAD 5 |
| 622 | @ FONTS {{DejaVu Sans Mono} Consolas Monaco} |
| 623 | @ FONT_SIZE 9 |
| 624 | @ PADX 5 |
| 625 | @ WIDTH 80 |
| 626 | @ HEIGHT 45 |
| 627 | @ LB_HEIGHT 25 |
| 628 | @ } |
| @@ -868,21 +866,15 @@ | |
| 868 | @ $txt tag config fn -background $CFG(FN_BG) -foreground $CFG(FN_FG) \ |
| 869 | @ -justify center |
| 870 | @ } |
| 871 | @ text .mkr |
| 872 | @ |
| 873 | @ font create mono -family courier -size $CFG(FONT_SIZE) |
| 874 | @ foreach font $CFG(FONTS) { |
| 875 | @ if {[lsearch -exact [font families] $font] != -1} { |
| 876 | @ font config mono -family $font |
| 877 | @ break |
| 878 | @ } |
| 879 | @ } |
| 880 | @ foreach c [cols] { |
| 881 | @ set keyPrefix [string toupper [colType $c]]_COL_ |
| 882 | @ $c config -bg $CFG(${keyPrefix}BG) -fg $CFG(${keyPrefix}FG) -borderwidth 0 \ |
| 883 | @ -font mono -padx $CFG(PADX) -yscroll sync-y |
| 884 | @ $c tag config hr -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \ |
| 885 | @ -foreground $CFG(HR_FG) |
| 886 | @ $c tag config fn -spacing1 $CFG(FN_PAD) -spacing3 $CFG(FN_PAD) |
| 887 | @ bindtags $c ". $c Text all" |
| 888 | @ bind $c <1> {focus %W} |
| 889 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -617,12 +617,10 @@ | |
| 617 | @ HR_PAD_TOP 4 |
| 618 | @ HR_PAD_BTM 8 |
| 619 | @ FN_BG #444444 |
| 620 | @ FN_FG #ffffff |
| 621 | @ FN_PAD 5 |
| 622 | @ PADX 5 |
| 623 | @ WIDTH 80 |
| 624 | @ HEIGHT 45 |
| 625 | @ LB_HEIGHT 25 |
| 626 | @ } |
| @@ -868,21 +866,15 @@ | |
| 866 | @ $txt tag config fn -background $CFG(FN_BG) -foreground $CFG(FN_FG) \ |
| 867 | @ -justify center |
| 868 | @ } |
| 869 | @ text .mkr |
| 870 | @ |
| 871 | @ foreach c [cols] { |
| 872 | @ set keyPrefix [string toupper [colType $c]]_COL_ |
| 873 | @ if {$tcl_platform(platform)=="windows"} {$c config -font {courier 9}} |
| 874 | @ $c config -bg $CFG(${keyPrefix}BG) -fg $CFG(${keyPrefix}FG) -borderwidth 0 \ |
| 875 | @ -padx $CFG(PADX) -yscroll sync-y |
| 876 | @ $c tag config hr -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \ |
| 877 | @ -foreground $CFG(HR_FG) |
| 878 | @ $c tag config fn -spacing1 $CFG(FN_PAD) -spacing3 $CFG(FN_PAD) |
| 879 | @ bindtags $c ". $c Text all" |
| 880 | @ bind $c <1> {focus %W} |
| 881 |