diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-09-23 15:35:48 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-09-23 15:35:48 +0000 |
| commit | 79ef6d642e7a5f8ee5333940e397f27e57268786 (patch) | |
| tree | e86cf520ac9629b02e96fdb7c72a281ca3c338bb /src/gui_gtk_x11.c | |
| parent | 67b891e16cdbff97c0b10e7ca9faef0dc397c6b5 (diff) | |
| download | vim-git-79ef6d642e7a5f8ee5333940e397f27e57268786.tar.gz | |
updated for version 7.2-263v7.2.263
Diffstat (limited to 'src/gui_gtk_x11.c')
| -rw-r--r-- | src/gui_gtk_x11.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 5281453d5..cb50d030f 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -4066,6 +4066,8 @@ gui_mch_open(void) { guicolor_T fg_pixel = INVALCOLOR; guicolor_T bg_pixel = INVALCOLOR; + guint pixel_width; + guint pixel_height; #ifdef HAVE_GTK2 /* @@ -4106,8 +4108,6 @@ gui_mch_open(void) unsigned int w, h; int x = 0; int y = 0; - guint pixel_width; - guint pixel_height; mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h); @@ -4160,9 +4160,16 @@ gui_mch_open(void) } } - gtk_form_set_size(GTK_FORM(gui.formwin), - (guint)(gui_get_base_width() + Columns * gui.char_width), - (guint)(gui_get_base_height() + Rows * gui.char_height)); + pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width); + pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height); +#ifdef HAVE_GTK2 + /* For GTK2 changing the size of the form widget doesn't cause window + * resizing. */ + if (gtk_socket_id == 0) + gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height); +#else + gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height); +#endif update_window_manager_hints(0, 0); if (foreground_argument != NULL) |