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
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
To: vim-dev@vim.org
Subject: Patch 7.2.065
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.065
Problem: GTK GUI: the cursor disappears when doing ":vsp" and the Vim
window is maximized. (Dominique Pelle, Denis Smolyar)
Solution: Don't change "Columns" back to an old value at a wrong moment.
Do change "Rows" when it should not be a problem.
Files: src/gui.c
*** ../vim-7.2.064/src/gui.c Fri Nov 28 21:26:50 2008
--- src/gui.c Wed Dec 3 18:01:21 2008
***************
*** 3241,3247 ****
i = Rows;
gui_update_tabline();
Rows = i;
! need_set_size = RESIZE_VERT;
if (using_tabline)
fix_size = TRUE;
if (!gui_use_tabline())
--- 3241,3247 ----
i = Rows;
gui_update_tabline();
Rows = i;
! need_set_size |= RESIZE_VERT;
if (using_tabline)
fix_size = TRUE;
if (!gui_use_tabline())
***************
*** 3275,3283 ****
if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
{
if (i == SBAR_BOTTOM)
! need_set_size = RESIZE_VERT;
else
! need_set_size = RESIZE_HOR;
if (gui.which_scrollbars[i])
fix_size = TRUE;
}
--- 3275,3283 ----
if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
{
if (i == SBAR_BOTTOM)
! need_set_size |= RESIZE_VERT;
else
! need_set_size |= RESIZE_HOR;
if (gui.which_scrollbars[i])
fix_size = TRUE;
}
***************
*** 3297,3303 ****
gui_mch_enable_menu(gui.menu_is_active);
Rows = i;
prev_menu_is_active = gui.menu_is_active;
! need_set_size = RESIZE_VERT;
if (gui.menu_is_active)
fix_size = TRUE;
}
--- 3297,3303 ----
gui_mch_enable_menu(gui.menu_is_active);
Rows = i;
prev_menu_is_active = gui.menu_is_active;
! need_set_size |= RESIZE_VERT;
if (gui.menu_is_active)
fix_size = TRUE;
}
***************
*** 3308,3314 ****
{
gui_mch_show_toolbar(using_toolbar);
prev_toolbar = using_toolbar;
! need_set_size = RESIZE_VERT;
if (using_toolbar)
fix_size = TRUE;
}
--- 3308,3314 ----
{
gui_mch_show_toolbar(using_toolbar);
prev_toolbar = using_toolbar;
! need_set_size |= RESIZE_VERT;
if (using_toolbar)
fix_size = TRUE;
}
***************
*** 3318,3324 ****
{
gui_mch_enable_footer(using_footer);
prev_footer = using_footer;
! need_set_size = RESIZE_VERT;
if (using_footer)
fix_size = TRUE;
}
--- 3318,3324 ----
{
gui_mch_enable_footer(using_footer);
prev_footer = using_footer;
! need_set_size |= RESIZE_VERT;
if (using_footer)
fix_size = TRUE;
}
***************
*** 3330,3339 ****
prev_tearoff = using_tearoff;
}
#endif
! if (need_set_size)
{
#ifdef FEAT_GUI_GTK
! long c = Columns;
#endif
/* Adjust the size of the window to make the text area keep the
* same size and to avoid that part of our window is off-screen
--- 3330,3340 ----
prev_tearoff = using_tearoff;
}
#endif
! if (need_set_size != 0)
{
#ifdef FEAT_GUI_GTK
! long prev_Columns = Columns;
! long prev_Rows = Rows;
#endif
/* Adjust the size of the window to make the text area keep the
* same size and to avoid that part of our window is off-screen
***************
*** 3349,3359 ****
* If you remove this, please test this command for resizing
* effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
* Don't do this while starting up though.
! * And don't change Rows, it may have be reduced intentionally
! * when adding menu/toolbar/tabline. */
! if (!gui.starting)
(void)char_avail();
! Columns = c;
#endif
}
#ifdef FEAT_WINDOWS
--- 3350,3363 ----
* If you remove this, please test this command for resizing
* effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
* Don't do this while starting up though.
! * Don't change Rows when adding menu/toolbar/tabline.
! * Don't change Columns when adding vertical toolbar. */
! if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR))
(void)char_avail();
! if ((need_set_size & RESIZE_VERT) == 0)
! Rows = prev_Rows;
! if ((need_set_size & RESIZE_HOR) == 0)
! Columns = prev_Columns;
#endif
}
#ifdef FEAT_WINDOWS
*** ../vim-7.2.064/src/version.c Wed Dec 3 13:38:00 2008
--- src/version.c Wed Dec 3 18:47:11 2008
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 65,
/**/
--
Seen on the back of a biker's vest: If you can read this, my wife fell off.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
