To: vim_dev@googlegroups.com
Subject: Patch 7.4b.001
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4b.001
Problem:    Win32: dialog may extend off-screen.
Solution:   Reduce the size, use correct borders. (Andrei Olsen)
Files:	    src/gui_w32.c


*** ../vim-7.4b.000/src/gui_w32.c	2013-07-21 17:51:37.000000000 +0200
--- src/gui_w32.c	2013-08-01 13:13:53.000000000 +0200
***************
*** 3179,3190 ****
  	maxDialogWidth = workarea_rect.right - workarea_rect.left - 100;
  	if (maxDialogWidth > 600)
  	    maxDialogWidth = 600;
! 	maxDialogHeight = workarea_rect.bottom - workarea_rect.top - 100;
      }
      else
      {
! 	/* Use our own window for the size, unless it's very small. */
! 	GetWindowRect(s_hwnd, &rect);
  	maxDialogWidth = rect.right - rect.left
  				   - (GetSystemMetrics(SM_CXFRAME) +
                                        GetSystemMetrics(SM_CXPADDEDBORDER)) * 2;
--- 3179,3192 ----
  	maxDialogWidth = workarea_rect.right - workarea_rect.left - 100;
  	if (maxDialogWidth > 600)
  	    maxDialogWidth = 600;
! 	/* Leave some room for the taskbar. */
! 	maxDialogHeight = workarea_rect.bottom - workarea_rect.top - 150;
      }
      else
      {
! 	/* Use our own window's client area for the size, unless it's very
! 	 * small. */
! 	GetClientRect(s_hwnd, &rect);
  	maxDialogWidth = rect.right - rect.left
  				   - (GetSystemMetrics(SM_CXFRAME) +
                                        GetSystemMetrics(SM_CXPADDEDBORDER)) * 2;
***************
*** 3192,3199 ****
  	    maxDialogWidth = DLG_MIN_MAX_WIDTH;
  
  	maxDialogHeight = rect.bottom - rect.top
! 				   - (GetSystemMetrics(SM_CXFRAME) +
!                                       GetSystemMetrics(SM_CXPADDEDBORDER)) * 2;
  	if (maxDialogHeight < DLG_MIN_MAX_HEIGHT)
  	    maxDialogHeight = DLG_MIN_MAX_HEIGHT;
      }
--- 3194,3201 ----
  	    maxDialogWidth = DLG_MIN_MAX_WIDTH;
  
  	maxDialogHeight = rect.bottom - rect.top
! 				   - (GetSystemMetrics(SM_CYFRAME) +
!                                       GetSystemMetrics(SM_CXPADDEDBORDER)) * 4;
  	if (maxDialogHeight < DLG_MIN_MAX_HEIGHT)
  	    maxDialogHeight = DLG_MIN_MAX_HEIGHT;
      }
*** ../vim-7.4b.000/src/version.c	2013-07-28 16:22:49.000000000 +0200
--- src/version.c	2013-08-01 13:19:23.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
  {   /* Add new patch number below this line */
+ /**/
+     1,
  /**/

-- 
If you put 7 of the most talented OSS developers in a room for a week
and asked them to fix a bug in a spreadsheet program, in 1 week
you'd have 2 new mail readers and a text-based web browser.

 /// 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    ///