commit ad3b6a3340a4ab02c1e5bc4a6d6a5fb858b671d3
author matveyt <matthewtarasov@yandex.ru> Sun Dec 08 10:26:51 2024 +0100
committer Christian Brabandt <cb@256bit.org> Sun Dec 08 10:26:51 2024 +0100
tree 55c8bc85a3a3a21aec09d70235d82616dcef48d6
parent 85ee742f1e961ea79597dd38d04b56ac35f45a1e

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 <matthewtarasov@yandex.ru>
Signed-off-by: Christian Brabandt <cb@256bit.org>

src/testdir/runtest.vim

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index ded3197..6fc0dcc 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -55,6 +55,10 @@
 
 " 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
 

src/testdir/test_gui.vim

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index ae65310..2925934 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -105,8 +105,8 @@
     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 @@
 
     " 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 @@
 
     " 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])
 

src/testdir/test_highlight.vim

diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 9bc5f12..5189b61 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -781,8 +781,8 @@
   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)