lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
33e8b10
To: vim-dev@vim.org
33e8b10
Subject: Patch 7.2.283
33e8b10
Fcc: outbox
33e8b10
From: Bram Moolenaar <Bram@moolenaar.net>
33e8b10
Mime-Version: 1.0
33e8b10
Content-Type: text/plain; charset=UTF-8
33e8b10
Content-Transfer-Encoding: 8bit
33e8b10
------------
33e8b10
33e8b10
Patch 7.2.283
33e8b10
Problem:    Changing font while the window is maximized doesn't keep the
33e8b10
	    window maximized.
33e8b10
Solution:   Recompute number of lines and columns after changing font. (James
33e8b10
	    Vega)
33e8b10
Files:	    src/gui_gtk_x11.c
33e8b10
33e8b10
33e8b10
*** ../vim-7.2.282/src/gui_gtk_x11.c	2009-09-23 18:14:13.000000000 +0200
33e8b10
--- src/gui_gtk_x11.c	2009-11-03 17:56:27.000000000 +0100
33e8b10
***************
33e8b10
*** 5267,5274 ****
33e8b10
  # endif
33e8b10
  #endif /* !HAVE_GTK2 */
33e8b10
  
33e8b10
!     /* Preserve the logical dimensions of the screen. */
33e8b10
!     update_window_manager_hints(0, 0);
33e8b10
  
33e8b10
      return OK;
33e8b10
  }
33e8b10
--- 5267,5290 ----
33e8b10
  # endif
33e8b10
  #endif /* !HAVE_GTK2 */
33e8b10
  
33e8b10
! #ifdef HAVE_GTK2
33e8b10
!     if (gui_mch_maximized())
33e8b10
!     {
33e8b10
! 	int w, h;
33e8b10
! 
33e8b10
! 	/* Update lines and columns in accordance with the new font, keep the
33e8b10
! 	 * window maximized. */
33e8b10
! 	gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h);
33e8b10
! 	w -= get_menu_tool_width();
33e8b10
! 	h -= get_menu_tool_height();
33e8b10
! 	gui_resize_shell(w, h);
33e8b10
!     }
33e8b10
!     else
33e8b10
! #endif
33e8b10
!     {
33e8b10
! 	/* Preserve the logical dimensions of the screen. */
33e8b10
! 	update_window_manager_hints(0, 0);
33e8b10
!     }
33e8b10
  
33e8b10
      return OK;
33e8b10
  }
33e8b10
*** ../vim-7.2.282/src/version.c	2009-11-03 18:04:26.000000000 +0100
33e8b10
--- src/version.c	2009-11-03 18:11:53.000000000 +0100
33e8b10
***************
33e8b10
*** 678,679 ****
33e8b10
--- 678,681 ----
33e8b10
  {   /* Add new patch number below this line */
33e8b10
+ /**/
33e8b10
+     283,
33e8b10
  /**/
33e8b10
33e8b10
-- 
33e8b10
If an elephant is left tied to a parking meter, the parking fee has to be paid
33e8b10
just as it would for a vehicle.
33e8b10
		[real standing law in Florida, United States of America]
33e8b10
33e8b10
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
33e8b10
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
33e8b10
\\\        download, build and distribute -- http://www.A-A-P.org        ///
33e8b10
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///