diff options
author | Bram Moolenaar <Bram@vim.org> | 2009-11-03 17:13:59 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2009-11-03 17:13:59 +0000 |
commit | e161c791f649afe33c2bd02dda42c71685ff9996 (patch) | |
tree | 91bdee2cc1d6f82eb1ebb94fb3a4cab44903dd5a | |
parent | eda6eb9f003989cf8f1303a2313672c8e77782ff (diff) | |
download | vim-git-e161c791f649afe33c2bd02dda42c71685ff9996.tar.gz |
updated for version 7.2-283v7.2.283
-rw-r--r-- | src/gui_gtk_x11.c | 20 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index ad6fc25e1..de8f265ec 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -5267,8 +5267,24 @@ gui_mch_init_font(char_u *font_name, int fontset UNUSED) # endif #endif /* !HAVE_GTK2 */ - /* Preserve the logical dimensions of the screen. */ - update_window_manager_hints(0, 0); +#ifdef HAVE_GTK2 + if (gui_mch_maximized()) + { + int w, h; + + /* Update lines and columns in accordance with the new font, keep the + * window maximized. */ + gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h); + w -= get_menu_tool_width(); + h -= get_menu_tool_height(); + gui_resize_shell(w, h); + } + else +#endif + { + /* Preserve the logical dimensions of the screen. */ + update_window_manager_hints(0, 0); + } return OK; } diff --git a/src/version.c b/src/version.c index c50d15ccf..83af0958b 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 283, +/**/ 282, /**/ 281, |