To: vim-dev@vim.org
Subject: Patch 6.0.117
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 6.0.117 (extra)
Problem:    Win32: when disabling the menu, "set lines=999" doesn't use all
	    the available screen space.
Solution:   Don't subtract the fixed caption height but the real menu height
	    from the available screen space.  Also: Avoid recursion in
	    gui_mswin_get_menu_height().
Files:	    src/gui_w32.c, src/gui_w48.c


*** ../vim60.116/src/gui_w32.c	Tue Jan  1 20:29:44 2002
--- src/gui_w32.c	Tue Jan  1 22:24:54 2002
***************
*** 330,338 ****
      }
  
      if (fix_window && menu_height != old_menu_height)
  	gui_set_shellsize(FALSE, FALSE);
  
-     old_menu_height = menu_height;
      return menu_height;
  }
  #endif /*FEAT_MENU*/
--- 330,340 ----
      }
  
      if (fix_window && menu_height != old_menu_height)
+     {
+ 	old_menu_height = menu_height;
  	gui_set_shellsize(FALSE, FALSE);
+     }
  
      return menu_height;
  }
  #endif /*FEAT_MENU*/
*** ../vim60.116/src/gui_w48.c	Wed Sep 19 19:37:40 2001
--- src/gui_w48.c	Tue Jan  1 22:59:35 2002
***************
*** 2368,2376 ****
  
      *screen_w = GetSystemMetrics(SM_CXSCREEN)
  	      - GetSystemMetrics(SM_CXFRAME) * 2;
      *screen_h = GetSystemMetrics(SM_CYFULLSCREEN)
  	      - GetSystemMetrics(SM_CYFRAME) * 2
! 	      - GetSystemMetrics(SM_CYCAPTION);
  }
  
      void
--- 2368,2382 ----
  
      *screen_w = GetSystemMetrics(SM_CXSCREEN)
  	      - GetSystemMetrics(SM_CXFRAME) * 2;
+     /* FIXME: dirty trick: Because the gui_get_base_height() doesn't include
+      * the menubar for MSwin, we subtract it from the screen height, so that
+      * the window size can be made to fit on the screen. */
      *screen_h = GetSystemMetrics(SM_CYFULLSCREEN)
  	      - GetSystemMetrics(SM_CYFRAME) * 2
! #ifdef FEAT_MENU
! 	      - gui_mswin_get_menu_height(FALSE)
! #endif
! 	      ;
  }
  
      void
*** ../vim60.116/src/version.c	Tue Jan  1 21:13:14 2002
--- src/version.c	Tue Jan  1 23:05:01 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     117,
  /**/

-- 
   GALAHAD hurries to the door and pushes through it.  As he leaves the room
   we CUT TO the reverse to show that he is now in a room full of bathing
   and romping GIRLIES, all innocent, wide-eyed and beautiful.  They smile
   enchantingly at him as he tries to keep walking without being diverted by
   the lovely sights assaulting his eyeballs.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
(((   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   )))
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///