forked from aniani/vim
updated for version 7.0c01
This commit is contained in:
parent
3964b7ea08
commit
04a9d4555a
@ -2209,4 +2209,19 @@ apparently doesn't work everywhere. Use %H:%M:%S instead.
|
|||||||
|
|
||||||
Typing BS at the "z=" prompt removed the prompt.
|
Typing BS at the "z=" prompt removed the prompt.
|
||||||
|
|
||||||
|
--- fixes since Vim 6.0c ---
|
||||||
|
|
||||||
|
When jumping to another tab page the Vim window size was always set, even when
|
||||||
|
nothing in the layout changed.
|
||||||
|
|
||||||
|
Win32 GUI tab pages line wasn't always enabled. Do a proper check for the
|
||||||
|
compiler version.
|
||||||
|
|
||||||
|
Win32: When switching between tab pages the Vim window was moved when part of
|
||||||
|
it was outside of the screen. Now only do that in the direction of a size
|
||||||
|
change.
|
||||||
|
|
||||||
|
Win32: added menu to GUI tab pages line. (Yegappan Lakshmanan)
|
||||||
|
|
||||||
|
|
||||||
vim:tw=78:ts=8:ft=help:norl:
|
vim:tw=78:ts=8:ft=help:norl:
|
||||||
|
@ -2728,7 +2728,7 @@ mainwin_screen_changed_cb(GtkWidget *widget,
|
|||||||
if (gui.norm_font != NULL)
|
if (gui.norm_font != NULL)
|
||||||
{
|
{
|
||||||
gui_mch_init_font(p_guifont, FALSE);
|
gui_mch_init_font(p_guifont, FALSE);
|
||||||
gui_set_shellsize(FALSE, FALSE);
|
gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* HAVE_GTK_MULTIHEAD */
|
#endif /* HAVE_GTK_MULTIHEAD */
|
||||||
@ -4247,7 +4247,8 @@ force_shell_resize_idle(gpointer data)
|
|||||||
void
|
void
|
||||||
gui_mch_set_shellsize(int width, int height,
|
gui_mch_set_shellsize(int width, int height,
|
||||||
int min_width, int min_height,
|
int min_width, int min_height,
|
||||||
int base_width, int base_height)
|
int base_width, int base_height,
|
||||||
|
int direction)
|
||||||
{
|
{
|
||||||
#ifndef HAVE_GTK2
|
#ifndef HAVE_GTK2
|
||||||
/* Hack: When the form already is at the desired size, the window might
|
/* Hack: When the form already is at the desired size, the window might
|
||||||
|
@ -1788,15 +1788,17 @@ gui_mch_set_winpos(x, y)
|
|||||||
NULL);
|
NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*ARGSUSED*/
|
||||||
void
|
void
|
||||||
gui_mch_set_shellsize(width, height, min_width, min_height,
|
gui_mch_set_shellsize(width, height, min_width, min_height,
|
||||||
base_width, base_height)
|
base_width, base_height, direction)
|
||||||
int width;
|
int width;
|
||||||
int height;
|
int height;
|
||||||
int min_width;
|
int min_width;
|
||||||
int min_height;
|
int min_height;
|
||||||
int base_width;
|
int base_width;
|
||||||
int base_height;
|
int base_height;
|
||||||
|
int direction;
|
||||||
{
|
{
|
||||||
#ifdef FEAT_XIM
|
#ifdef FEAT_XIM
|
||||||
height += xim_get_status_area_height(),
|
height += xim_get_status_area_height(),
|
||||||
|
@ -442,7 +442,7 @@ ex_menu(eap)
|
|||||||
|| gui.toolbar_height != old_toolbar_height
|
|| gui.toolbar_height != old_toolbar_height
|
||||||
# endif
|
# endif
|
||||||
))
|
))
|
||||||
gui_set_shellsize(FALSE, FALSE);
|
gui_set_shellsize(FALSE, FALSE, RESIZE_VERT);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
theend:
|
theend:
|
||||||
|
@ -11,7 +11,7 @@ extern void gui_init_menu_font __ARGS((void));
|
|||||||
extern void gui_mch_exit __ARGS((int rc));
|
extern void gui_mch_exit __ARGS((int rc));
|
||||||
extern int gui_mch_get_winpos __ARGS((int *x, int *y));
|
extern int gui_mch_get_winpos __ARGS((int *x, int *y));
|
||||||
extern void gui_mch_set_winpos __ARGS((int x, int y));
|
extern void gui_mch_set_winpos __ARGS((int x, int y));
|
||||||
extern void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height));
|
extern void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
|
||||||
extern void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
|
extern void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
|
||||||
extern int gui_mch_init_font __ARGS((char_u *font_name, int do_fontset));
|
extern int gui_mch_init_font __ARGS((char_u *font_name, int do_fontset));
|
||||||
extern GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing));
|
extern GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user