aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

updated for version 7.1-141

Browse Source
This commit is contained in:
Bram Moolenaar 2007-10-19 12:33:44 +00:00
parent f13249a717
commit 2dd8b521bb
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui_gtk_x11.c
View File

@ -4044,6 +4044,8 @@ gui_mch_open(void)
unsigned int w, h; unsigned int w, h;
int x = 0; int x = 0;
int y = 0; int y = 0;
guint pixel_width;
guint pixel_height;
mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h); mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
@ -4055,12 +4057,31 @@ gui_mch_open(void)
p_window = h - 1; p_window = h - 1;
Rows = h; 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)) 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 #ifdef HAVE_GTK2
gtk_window_move(GTK_WINDOW(gui.mainwin), x, y); gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
#else #else
gtk_widget_set_uposition(gui.mainwin, x, y); gtk_widget_set_uposition(gui.mainwin, x, y);
#endif #endif
}
vim_free(gui.geom); vim_free(gui.geom);
gui.geom = NULL; gui.geom = NULL;
@ -4071,14 +4092,6 @@ gui_mch_open(void)
*/ */
if (gtk_socket_id != 0 && (mask & WidthValue || mask & HeightValue)) 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); update_window_manager_hints(pixel_width, pixel_height);
init_window_hints_state = 1; init_window_hints_state = 1;
g_timeout_add(1000, check_startup_plug_hints, NULL); g_timeout_add(1000, check_startup_plug_hints, NULL);

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
141,
/**/ /**/
140, 140,
/**/ /**/