0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

updated for version 7.2.350

Problem:    Win32: When changing font the window may jump from the secondary
            to the primary screen. (Michael Wookey)
Solution:   When the screen position was negative don't correct it to zero.
This commit is contained in:
Bram Moolenaar
2010-01-27 21:05:05 +01:00
parent 6d1dcffc35
commit c5d5d01ad9
2 changed files with 12 additions and 4 deletions

View File

@@ -1390,6 +1390,7 @@ gui_set_shellsize(mustset, fit_to_display, direction)
int un_maximize = mustset;
int did_adjust = 0;
#endif
int x = -1, y = -1;
if (!gui.shell_created)
return;
@@ -1406,6 +1407,10 @@ gui_set_shellsize(mustset, fit_to_display, direction)
base_width = gui_get_base_width();
base_height = gui_get_base_height();
if (fit_to_display)
/* Remember the original window position. */
gui_mch_get_winpos(&x, &y);
#ifdef USE_SUN_WORKSHOP
if (!mustset && usingSunWorkShop
&& workshop_get_width_height(&width, &height))
@@ -1473,11 +1478,12 @@ gui_set_shellsize(mustset, fit_to_display, direction)
gui_mch_set_shellsize(width, height, min_width, min_height,
base_width, base_height, direction);
if (fit_to_display)
{
int x, y;
/* Some window managers put the Vim window left of/above the screen. */
if (fit_to_display && x >= 0 && y >= 0)
{
/* Some window managers put the Vim window left of/above the screen.
* Only change the position if it wasn't already negative before
* (happens on MS-Windows with a secondary monitor). */
gui_mch_update();
if (gui_mch_get_winpos(&x, &y) == OK && (x < 0 || y < 0))
gui_mch_set_winpos(x < 0 ? 0 : x, y < 0 ? 0 : y);

View File

@@ -681,6 +681,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
350,
/**/
349,
/**/