From ad3b6a3340a4ab02c1e5bc4a6d6a5fb858b671d3 Mon Sep 17 00:00:00 2001 From: matveyt Date: Sun, 8 Dec 2024 10:26:51 +0100 Subject: [PATCH] patch 9.1.0915: GVim: default font size a bit too small Problem: GVim: default font size a bit too small Solution: increase guifont size to 12 pt on GTK builds of gVim (matveyt). fixes: #16172 closes: #16178 Signed-off-by: matveyt Signed-off-by: Christian Brabandt --- runtime/doc/version9.txt | 2 ++ src/gui_gtk_x11.c | 2 +- src/os_mswin.c | 4 ++-- src/testdir/runtest.vim | 4 ++++ src/testdir/test_gui.vim | 8 ++++---- src/testdir/test_highlight.vim | 4 ++-- src/version.c | 2 ++ 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt index 312a1c23e7..76911425c5 100644 --- a/runtime/doc/version9.txt +++ b/runtime/doc/version9.txt @@ -41615,6 +41615,8 @@ Changed~ and removed from |defaults.vim| - the completed word and completion type are provided when handling the |CompleteDone| autocommand in the |v:event| dictionary +- the default fontsize for the GTK builds of Vim (Windows and Unix) has been + increased to 12pt to accomodate modern high-dpi monitors *added-9.2* Added ~ diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 6c97d1a196..c037702ad9 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -160,7 +160,7 @@ static const GtkTargetEntry dnd_targets[] = * "Monospace" is a standard font alias that should be present * on all proper Pango/fontconfig installations. */ -# define DEFAULT_FONT "Monospace 10" +# define DEFAULT_FONT "Monospace 12" #if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION) # define USE_GNOME_SESSION diff --git a/src/os_mswin.c b/src/os_mswin.c index 95e3cbcb91..485ee20afc 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -2729,8 +2729,8 @@ quality_id2name(DWORD id) } // The default font height in 100% scaling (96dpi). -// (-12 in 96dpi equates to roughly 9pt) -#define DEFAULT_FONT_HEIGHT (-12) +// (-16 in 96dpi equates to roughly 12pt) +#define DEFAULT_FONT_HEIGHT (-16) static const LOGFONTW s_lfDefault = { diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index ded31975b8..6fc0dcc669 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -55,6 +55,10 @@ silent! endwhile " In the GUI we can always change the screen size. if has('gui_running') + if has('gui_gtk') + " to keep screendump size unchanged + set guifont=Monospace\ 10 + endif set columns=80 lines=25 endif diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index ae65310627..29259345c3 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -105,8 +105,8 @@ func Test_getfontname_without_arg() let pat = '\(7x13\)\|\(\c-Misc-Fixed-Medium-R-Normal--13-120-75-75-C-70-ISO8859-1\)' call assert_match(pat, fname) elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') - " 'expected' is DEFAULT_FONT of gui_gtk_x11.c. - call assert_equal('Monospace 10', fname) + " 'expected' is DEFAULT_FONT of gui_gtk_x11.c (any size) + call assert_match('^Monospace\>', fname) endif endfunc @@ -426,7 +426,7 @@ func Test_set_guifont() " Empty list. Should fallback to the built-in default. set guifont= - call assert_equal('Monospace 10', getfontname()) + call assert_match('^Monospace\>', getfontname()) endif if has('xfontset') @@ -613,7 +613,7 @@ func Test_expand_guifont() " Test recalling default and existing option set guifont= - call assert_equal('Monospace\ 10', getcompletion('set guifont=', 'cmdline')[0]) + call assert_match('^Monospace\>', getcompletion('set guifont=', 'cmdline')[0]) set guifont=Monospace\ 9 call assert_equal('Monospace\ 9', getcompletion('set guifont=', 'cmdline')[0]) diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim index 9bc5f12455..5189b618cf 100644 --- a/src/testdir/test_highlight.vim +++ b/src/testdir/test_highlight.vim @@ -781,8 +781,8 @@ func Test_1_highlight_Normalgroup_exists() if !has('gui_running') call assert_match('hi Normal\s*clear', hlNormal) elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') - " expect is DEFAULT_FONT of gui_gtk_x11.c - call assert_match('hi Normal\s*font=Monospace 10', hlNormal) + " expect is DEFAULT_FONT of gui_gtk_x11.c (any size) + call assert_match('hi Normal\s*font=Monospace\>', hlNormal) elseif has('gui_motif') " expect is DEFAULT_FONT of gui_x11.c call assert_match('hi Normal\s*font=7x13', hlNormal) diff --git a/src/version.c b/src/version.c index 1ae3f53369..07bb851f1b 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 915, /**/ 914, /**/ -- 2.39.5