Mercurial > vim
changeset 3014:342b17608967 v7.3.279
updated for version 7.3.279
Problem: With GTK, when gvim is full-screen and a tab is opened and using a
specific monitor configuration the window is too big.
Solution: Adjust the window size like on MS-Windows. (Yukihiro Nakadaira)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 10 Aug 2011 17:44:45 +0200 |
| parents | 655bb25912e9 |
| children | 3cce0a65c296 |
| files | src/gui.c src/gui_gtk_x11.c src/proto/gui_gtk_x11.pro src/version.c |
| diffstat | 4 files changed, 20 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -1407,7 +1407,7 @@ gui_set_shellsize(mustset, fit_to_displa if (!gui.shell_created) return; -#ifdef MSWIN +#if defined(MSWIN) || defined(FEAT_GUI_GTK) /* If not setting to a user specified size and maximized, calculate the * number of characters that fit in the maximized window. */ if (!mustset && gui_mch_maximized())
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3900,6 +3900,21 @@ gui_mch_unmaximize() } /* + * Called when the font changed while the window is maximized. Compute the + * new Rows and Columns. This is like resizing the window. + */ + void +gui_mch_newfont() +{ + int w, h; + + 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); +} + +/* * Set the windows size. */ void @@ -4409,14 +4424,9 @@ gui_mch_init_font(char_u *font_name, int 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); + gui_mch_newfont(); } else {
--- a/src/proto/gui_gtk_x11.pro +++ b/src/proto/gui_gtk_x11.pro @@ -20,6 +20,7 @@ int gui_mch_get_winpos __ARGS((int *x, i void gui_mch_set_winpos __ARGS((int x, int y)); int gui_mch_maximized __ARGS((void)); void gui_mch_unmaximize __ARGS((void)); +void gui_mch_newfont __ARGS((void)); void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction)); void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h)); void gui_mch_settitle __ARGS((char_u *title, char_u *icon));