1 To: [email protected] |
|
2 Subject: Patch 7.2.065 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=ISO-8859-1 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.065 |
|
11 Problem: GTK GUI: the cursor disappears when doing ":vsp" and the Vim |
|
12 window is maximized. (Dominique Pelle, Denis Smolyar) |
|
13 Solution: Don't change "Columns" back to an old value at a wrong moment. |
|
14 Do change "Rows" when it should not be a problem. |
|
15 Files: src/gui.c |
|
16 |
|
17 |
|
18 *** ../vim-7.2.064/src/gui.c Fri Nov 28 21:26:50 2008 |
|
19 --- src/gui.c Wed Dec 3 18:01:21 2008 |
|
20 *************** |
|
21 *** 3241,3247 **** |
|
22 i = Rows; |
|
23 gui_update_tabline(); |
|
24 Rows = i; |
|
25 ! need_set_size = RESIZE_VERT; |
|
26 if (using_tabline) |
|
27 fix_size = TRUE; |
|
28 if (!gui_use_tabline()) |
|
29 --- 3241,3247 ---- |
|
30 i = Rows; |
|
31 gui_update_tabline(); |
|
32 Rows = i; |
|
33 ! need_set_size |= RESIZE_VERT; |
|
34 if (using_tabline) |
|
35 fix_size = TRUE; |
|
36 if (!gui_use_tabline()) |
|
37 *************** |
|
38 *** 3275,3283 **** |
|
39 if (gui.which_scrollbars[i] != prev_which_scrollbars[i]) |
|
40 { |
|
41 if (i == SBAR_BOTTOM) |
|
42 ! need_set_size = RESIZE_VERT; |
|
43 else |
|
44 ! need_set_size = RESIZE_HOR; |
|
45 if (gui.which_scrollbars[i]) |
|
46 fix_size = TRUE; |
|
47 } |
|
48 --- 3275,3283 ---- |
|
49 if (gui.which_scrollbars[i] != prev_which_scrollbars[i]) |
|
50 { |
|
51 if (i == SBAR_BOTTOM) |
|
52 ! need_set_size |= RESIZE_VERT; |
|
53 else |
|
54 ! need_set_size |= RESIZE_HOR; |
|
55 if (gui.which_scrollbars[i]) |
|
56 fix_size = TRUE; |
|
57 } |
|
58 *************** |
|
59 *** 3297,3303 **** |
|
60 gui_mch_enable_menu(gui.menu_is_active); |
|
61 Rows = i; |
|
62 prev_menu_is_active = gui.menu_is_active; |
|
63 ! need_set_size = RESIZE_VERT; |
|
64 if (gui.menu_is_active) |
|
65 fix_size = TRUE; |
|
66 } |
|
67 --- 3297,3303 ---- |
|
68 gui_mch_enable_menu(gui.menu_is_active); |
|
69 Rows = i; |
|
70 prev_menu_is_active = gui.menu_is_active; |
|
71 ! need_set_size |= RESIZE_VERT; |
|
72 if (gui.menu_is_active) |
|
73 fix_size = TRUE; |
|
74 } |
|
75 *************** |
|
76 *** 3308,3314 **** |
|
77 { |
|
78 gui_mch_show_toolbar(using_toolbar); |
|
79 prev_toolbar = using_toolbar; |
|
80 ! need_set_size = RESIZE_VERT; |
|
81 if (using_toolbar) |
|
82 fix_size = TRUE; |
|
83 } |
|
84 --- 3308,3314 ---- |
|
85 { |
|
86 gui_mch_show_toolbar(using_toolbar); |
|
87 prev_toolbar = using_toolbar; |
|
88 ! need_set_size |= RESIZE_VERT; |
|
89 if (using_toolbar) |
|
90 fix_size = TRUE; |
|
91 } |
|
92 *************** |
|
93 *** 3318,3324 **** |
|
94 { |
|
95 gui_mch_enable_footer(using_footer); |
|
96 prev_footer = using_footer; |
|
97 ! need_set_size = RESIZE_VERT; |
|
98 if (using_footer) |
|
99 fix_size = TRUE; |
|
100 } |
|
101 --- 3318,3324 ---- |
|
102 { |
|
103 gui_mch_enable_footer(using_footer); |
|
104 prev_footer = using_footer; |
|
105 ! need_set_size |= RESIZE_VERT; |
|
106 if (using_footer) |
|
107 fix_size = TRUE; |
|
108 } |
|
109 *************** |
|
110 *** 3330,3339 **** |
|
111 prev_tearoff = using_tearoff; |
|
112 } |
|
113 #endif |
|
114 ! if (need_set_size) |
|
115 { |
|
116 #ifdef FEAT_GUI_GTK |
|
117 ! long c = Columns; |
|
118 #endif |
|
119 /* Adjust the size of the window to make the text area keep the |
|
120 * same size and to avoid that part of our window is off-screen |
|
121 --- 3330,3340 ---- |
|
122 prev_tearoff = using_tearoff; |
|
123 } |
|
124 #endif |
|
125 ! if (need_set_size != 0) |
|
126 { |
|
127 #ifdef FEAT_GUI_GTK |
|
128 ! long prev_Columns = Columns; |
|
129 ! long prev_Rows = Rows; |
|
130 #endif |
|
131 /* Adjust the size of the window to make the text area keep the |
|
132 * same size and to avoid that part of our window is off-screen |
|
133 *************** |
|
134 *** 3349,3359 **** |
|
135 * If you remove this, please test this command for resizing |
|
136 * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q". |
|
137 * Don't do this while starting up though. |
|
138 ! * And don't change Rows, it may have be reduced intentionally |
|
139 ! * when adding menu/toolbar/tabline. */ |
|
140 ! if (!gui.starting) |
|
141 (void)char_avail(); |
|
142 ! Columns = c; |
|
143 #endif |
|
144 } |
|
145 #ifdef FEAT_WINDOWS |
|
146 --- 3350,3363 ---- |
|
147 * If you remove this, please test this command for resizing |
|
148 * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q". |
|
149 * Don't do this while starting up though. |
|
150 ! * Don't change Rows when adding menu/toolbar/tabline. |
|
151 ! * Don't change Columns when adding vertical toolbar. */ |
|
152 ! if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR)) |
|
153 (void)char_avail(); |
|
154 ! if ((need_set_size & RESIZE_VERT) == 0) |
|
155 ! Rows = prev_Rows; |
|
156 ! if ((need_set_size & RESIZE_HOR) == 0) |
|
157 ! Columns = prev_Columns; |
|
158 #endif |
|
159 } |
|
160 #ifdef FEAT_WINDOWS |
|
161 *** ../vim-7.2.064/src/version.c Wed Dec 3 13:38:00 2008 |
|
162 --- src/version.c Wed Dec 3 18:47:11 2008 |
|
163 *************** |
|
164 *** 678,679 **** |
|
165 --- 678,681 ---- |
|
166 { /* Add new patch number below this line */ |
|
167 + /**/ |
|
168 + 65, |
|
169 /**/ |
|
170 |
|
171 -- |
|
172 Seen on the back of a biker's vest: If you can read this, my wife fell off. |
|
173 |
|
174 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
175 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
176 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
177 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|