diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-10-19 12:33:44 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-10-19 12:33:44 +0000 |
| commit | 2dd8b521bb07b188bb027481c6acb77bf3ea444e (patch) | |
| tree | c19409d832c5f3ba31786b556fbecee3c848e434 | |
| parent | f13249a717385d3dd716eb9fa2053aba60d0da62 (diff) | |
| download | vim-git-2dd8b521bb07b188bb027481c6acb77bf3ea444e.tar.gz | |
updated for version 7.1-141v7.1.141
| -rw-r--r-- | src/gui_gtk_x11.c | 29 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 23 insertions, 8 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index f37410643..3235f40d5 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -4044,6 +4044,8 @@ 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); @@ -4055,12 +4057,31 @@ gui_mch_open(void) p_window = h - 1; Rows = h; } + + 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 + pixel_width += get_menu_tool_width(); + pixel_height += get_menu_tool_height(); +#endif + if (mask & (XValue | YValue)) + { + int w, h; + gui_mch_get_screen_dimensions(&w, &h); + h += p_ghr + get_menu_tool_height(); + w += get_menu_tool_width(); + if (mask & XNegative) + x += w - pixel_width; + if (mask & YNegative) + y += h - pixel_height; #ifdef HAVE_GTK2 gtk_window_move(GTK_WINDOW(gui.mainwin), x, y); #else gtk_widget_set_uposition(gui.mainwin, x, y); #endif + } vim_free(gui.geom); gui.geom = NULL; @@ -4071,14 +4092,6 @@ gui_mch_open(void) */ if (gtk_socket_id != 0 && (mask & WidthValue || mask & HeightValue)) { - guint pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width); - guint pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height); - -#ifdef HAVE_GTK2 - pixel_width += get_menu_tool_width(); - pixel_height += get_menu_tool_height(); -#endif - update_window_manager_hints(pixel_width, pixel_height); init_window_hints_state = 1; g_timeout_add(1000, check_startup_plug_hints, NULL); diff --git a/src/version.c b/src/version.c index 6763d6667..5b9ad74be 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 141, +/**/ 140, /**/ 139, |