1 To: [email protected] |
|
2 Subject: Patch 7.2.350 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.350 |
|
11 Problem: Win32: When changing font the window may jump from the secondary |
|
12 to the primary screen. (Michael Wookey) |
|
13 Solution: When the screen position was negative don't correct it to zero. |
|
14 Files: src/gui.c |
|
15 |
|
16 |
|
17 *** ../vim-7.2.349/src/gui.c 2009-09-23 18:14:13.000000000 +0200 |
|
18 --- src/gui.c 2010-01-27 21:02:32.000000000 +0100 |
|
19 *************** |
|
20 *** 1390,1395 **** |
|
21 --- 1390,1396 ---- |
|
22 int un_maximize = mustset; |
|
23 int did_adjust = 0; |
|
24 #endif |
|
25 + int x = -1, y = -1; |
|
26 |
|
27 if (!gui.shell_created) |
|
28 return; |
|
29 *************** |
|
30 *** 1406,1411 **** |
|
31 --- 1407,1416 ---- |
|
32 |
|
33 base_width = gui_get_base_width(); |
|
34 base_height = gui_get_base_height(); |
|
35 + if (fit_to_display) |
|
36 + /* Remember the original window position. */ |
|
37 + gui_mch_get_winpos(&x, &y); |
|
38 + |
|
39 #ifdef USE_SUN_WORKSHOP |
|
40 if (!mustset && usingSunWorkShop |
|
41 && workshop_get_width_height(&width, &height)) |
|
42 *************** |
|
43 *** 1473,1483 **** |
|
44 |
|
45 gui_mch_set_shellsize(width, height, min_width, min_height, |
|
46 base_width, base_height, direction); |
|
47 - if (fit_to_display) |
|
48 - { |
|
49 - int x, y; |
|
50 |
|
51 ! /* Some window managers put the Vim window left of/above the screen. */ |
|
52 gui_mch_update(); |
|
53 if (gui_mch_get_winpos(&x, &y) == OK && (x < 0 || y < 0)) |
|
54 gui_mch_set_winpos(x < 0 ? 0 : x, y < 0 ? 0 : y); |
|
55 --- 1478,1489 ---- |
|
56 |
|
57 gui_mch_set_shellsize(width, height, min_width, min_height, |
|
58 base_width, base_height, direction); |
|
59 |
|
60 ! if (fit_to_display && x >= 0 && y >= 0) |
|
61 ! { |
|
62 ! /* Some window managers put the Vim window left of/above the screen. |
|
63 ! * Only change the position if it wasn't already negative before |
|
64 ! * (happens on MS-Windows with a secondary monitor). */ |
|
65 gui_mch_update(); |
|
66 if (gui_mch_get_winpos(&x, &y) == OK && (x < 0 || y < 0)) |
|
67 gui_mch_set_winpos(x < 0 ? 0 : x, y < 0 ? 0 : y); |
|
68 *** ../vim-7.2.349/src/version.c 2010-01-27 20:26:41.000000000 +0100 |
|
69 --- src/version.c 2010-01-27 21:03:41.000000000 +0100 |
|
70 *************** |
|
71 *** 683,684 **** |
|
72 --- 683,686 ---- |
|
73 { /* Add new patch number below this line */ |
|
74 + /**/ |
|
75 + 350, |
|
76 /**/ |
|
77 |
|
78 -- |
|
79 hundred-and-one symptoms of being an internet addict: |
|
80 160. You get in the elevator and double-click the button for the floor |
|
81 you want. |
|
82 |
|
83 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
84 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
85 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
86 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|