| リビジョン | c44058ba78bc108e98fc15a14756716c3d3241fb (tree) |
|---|---|
| 日時 | 2007-10-19 21:33:44 |
| 作者 | vimboss |
| コミッター | vimboss |
updated for version 7.1-141
src/gui_gtk_x11.c (diff) src/version.c (diff)| @@ -4044,6 +4044,8 @@ | ||
| 4044 | 4044 | unsigned int w, h; |
| 4045 | 4045 | int x = 0; |
| 4046 | 4046 | int y = 0; |
| 4047 | + guint pixel_width; | |
| 4048 | + guint pixel_height; | |
| 4047 | 4049 | |
| 4048 | 4050 | mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h); |
| 4049 | 4051 |
| @@ -4055,12 +4057,31 @@ | ||
| 4055 | 4057 | p_window = h - 1; |
| 4056 | 4058 | Rows = h; |
| 4057 | 4059 | } |
| 4060 | + | |
| 4061 | + pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width); | |
| 4062 | + pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height); | |
| 4063 | + | |
| 4064 | +#ifdef HAVE_GTK2 | |
| 4065 | + pixel_width += get_menu_tool_width(); | |
| 4066 | + pixel_height += get_menu_tool_height(); | |
| 4067 | +#endif | |
| 4068 | + | |
| 4058 | 4069 | if (mask & (XValue | YValue)) |
| 4070 | + { | |
| 4071 | + int w, h; | |
| 4072 | + gui_mch_get_screen_dimensions(&w, &h); | |
| 4073 | + h += p_ghr + get_menu_tool_height(); | |
| 4074 | + w += get_menu_tool_width(); | |
| 4075 | + if (mask & XNegative) | |
| 4076 | + x += w - pixel_width; | |
| 4077 | + if (mask & YNegative) | |
| 4078 | + y += h - pixel_height; | |
| 4059 | 4079 | #ifdef HAVE_GTK2 |
| 4060 | 4080 | gtk_window_move(GTK_WINDOW(gui.mainwin), x, y); |
| 4061 | 4081 | #else |
| 4062 | 4082 | gtk_widget_set_uposition(gui.mainwin, x, y); |
| 4063 | 4083 | #endif |
| 4084 | + } | |
| 4064 | 4085 | vim_free(gui.geom); |
| 4065 | 4086 | gui.geom = NULL; |
| 4066 | 4087 |
| @@ -4071,14 +4092,6 @@ | ||
| 4071 | 4092 | */ |
| 4072 | 4093 | if (gtk_socket_id != 0 && (mask & WidthValue || mask & HeightValue)) |
| 4073 | 4094 | { |
| 4074 | - guint pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width); | |
| 4075 | - guint pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height); | |
| 4076 | - | |
| 4077 | -#ifdef HAVE_GTK2 | |
| 4078 | - pixel_width += get_menu_tool_width(); | |
| 4079 | - pixel_height += get_menu_tool_height(); | |
| 4080 | -#endif | |
| 4081 | - | |
| 4082 | 4095 | update_window_manager_hints(pixel_width, pixel_height); |
| 4083 | 4096 | init_window_hints_state = 1; |
| 4084 | 4097 | g_timeout_add(1000, check_startup_plug_hints, NULL); |
| @@ -667,6 +667,8 @@ | ||
| 667 | 667 | static int included_patches[] = |
| 668 | 668 | { /* Add new patch number below this line */ |
| 669 | 669 | /**/ |
| 670 | + 141, | |
| 671 | +/**/ | |
| 670 | 672 | 140, |
| 671 | 673 | /**/ |
| 672 | 674 | 139, |
Vim
Fork