summaryrefslogtreecommitdiff
path: root/data/vim/patches/8.1.1092
blob: 2c5f0a5d9429d450fc82fe2a0cc1b6c035d27b8b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
To: vim_dev@googlegroups.com
Subject: Patch 8.1.1092
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.1092
Problem:    Setting 'guifont' when maximized resizes the Vim window. When
            'guioptions' contains "k" gvim may open with a tiny window.
Solution:   Avoid un-maximizing when setting 'guifont'. (Yee Cheng Chin,
            closes #3808)
Files:	    src/gui.c


*** ../vim-8.1.1091/src/gui.c	2019-03-30 18:46:57.352077376 +0100
--- src/gui.c	2019-03-30 20:22:59.088541285 +0100
***************
*** 681,688 ****
  #ifndef FEAT_GUI_GTK
      // Set the shell size, adjusted for the screen size.  For GTK this only
      // works after the shell has been opened, thus it is further down.
!     // For MS-Windows pass FALSE for "mustset" to make --windowid work.
!     gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
  #endif
  #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
      /* Need to set the size of the menubar after all the menus have been
--- 681,693 ----
  #ifndef FEAT_GUI_GTK
      // Set the shell size, adjusted for the screen size.  For GTK this only
      // works after the shell has been opened, thus it is further down.
!     // If the window is already maximized (e.g. when --windowid is passed in),
!     // we want to use the system-provided dimensions by passing FALSE to
!     // mustset. Otherwise, we want to initialize with the default rows/columns.
!     if (gui_mch_maximized())
! 	gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
!     else
! 	gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
  #endif
  #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
      /* Need to set the size of the menubar after all the menus have been
***************
*** 721,727 ****
  # endif
  
  	/* Now make sure the shell fits on the screen. */
! 	gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
  #endif
  	/* When 'lines' was set while starting up the topframe may have to be
  	 * resized. */
--- 726,735 ----
  # endif
  
  	/* Now make sure the shell fits on the screen. */
! 	if (gui_mch_maximized())
! 	    gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
! 	else
! 	    gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
  #endif
  	/* When 'lines' was set while starting up the topframe may have to be
  	 * resized. */
***************
*** 906,912 ****
  # endif
  	    gui_mch_set_font(gui.norm_font);
  #endif
! 	gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
      }
  
      return ret;
--- 914,920 ----
  # endif
  	    gui_mch_set_font(gui.norm_font);
  #endif
! 	gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
      }
  
      return ret;
*** ../vim-8.1.1091/src/version.c	2019-03-30 20:11:45.749471761 +0100
--- src/version.c	2019-03-30 20:28:23.410094136 +0100
***************
*** 777,778 ****
--- 777,780 ----
  {   /* Add new patch number below this line */
+ /**/
+     1092,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
168. You have your own domain name.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///