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

updated for version 7.0074

Browse Source
This commit is contained in:
Bram Moolenaar
2005-05-20 21:22:17 +00:00
parent 686f51ef8e
commit c1087e64bc
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui.c
View File

@@ -3242,10 +3242,29 @@ gui_init_which_components(oldval)
} }
#endif #endif
if (need_set_size) if (need_set_size)
{
#ifdef FEAT_GUI_GTK
long r = Rows;
long c = Columns;
#endif
/* Adjust the size of the window to make the text area keep the /* Adjust the size of the window to make the text area keep the
* same size and to avoid that part of our window is off-screen * same size and to avoid that part of our window is off-screen
* and a scrollbar can't be used, for example. */ * and a scrollbar can't be used, for example. */
gui_set_shellsize(FALSE, fix_size); gui_set_shellsize(FALSE, fix_size);
#ifdef FEAT_GUI_GTK
/* GTK has the annoying habit of sending us resize events when
* changing the window size ourselves. This mostly happens when
* waiting for a character to arrive, quite unpredictably, and may
* change Columns and Rows when we don't want it. Wait for a
* character here to avoid this effect.
* If you remove this, please test this command for resizing
* effects: ":vsp|q|vsp|q|vsp|q" */
(void)char_avail();
Rows = r;
Columns = c;
#endif
}
} }
} }

4
src/gui_w48.c
View File

@@ -1667,7 +1667,7 @@ process_message(void)
* mapped we want to use the mapping instead. */ * mapped we want to use the mapping instead. */
if (vk == VK_F10 if (vk == VK_F10
&& gui.menu_is_active && gui.menu_is_active
&& check_map(k10, State, FALSE) == NULL) && check_map(k10, State, FALSE, TRUE) == NULL)
break; break;
#endif #endif
if (GetKeyState(VK_SHIFT) & 0x8000) if (GetKeyState(VK_SHIFT) & 0x8000)
@@ -1781,7 +1781,7 @@ process_message(void)
/* Check for <F10>: Default effect is to select the menu. When <F10> is /* Check for <F10>: Default effect is to select the menu. When <F10> is
* mapped we need to stop it here to avoid strange effects (e.g., for the * mapped we need to stop it here to avoid strange effects (e.g., for the
* key-up event) */ * key-up event) */
if (vk != VK_F10 || check_map(k10, State, FALSE) == NULL) if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE) == NULL)
#endif #endif
DispatchMessage(&msg); DispatchMessage(&msg);
} }