projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| f3c378e8 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.099 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.0.099 | |
| 11 | Problem: GUI: When the popup menu is visible using the scrollbar messes up | |
| 12 | the display. | |
| 13 | Solution: Disallow scrolling the current window. Redraw the popup menu | |
| 14 | after scrolling another window. | |
| 15 | Files: src/gui.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.0.098/src/gui.c Tue Aug 29 18:16:37 2006 | |
| 19 | --- src/gui.c Sun Sep 10 21:28:57 2006 | |
| 20 | *************** | |
| 21 | *** 3734,3739 **** | |
| 22 | --- 3734,3745 ---- | |
| 23 | if (dont_scroll || input_available()) | |
| 24 | return; | |
| 25 | #endif | |
| 26 | + #ifdef FEAT_INS_EXPAND | |
| 27 | + /* Disallow scrolling the current window when the completion popup menu is | |
| 28 | + * visible. */ | |
| 29 | + if ((sb->wp == NULL || sb->wp == curwin) && pum_visible()) | |
| 30 | + return; | |
| 31 | + #endif | |
| 32 | ||
| 33 | #ifdef FEAT_RIGHTLEFT | |
| 34 | if (sb->wp == NULL && curwin->w_p_rl) | |
| 35 | *************** | |
| 36 | *** 4207,4212 **** | |
| 37 | --- 4213,4224 ---- | |
| 38 | redraw_win_later(wp, VALID); | |
| 39 | updateWindow(wp); /* update window, status line, and cmdline */ | |
| 40 | } | |
| 41 | + | |
| 42 | + #ifdef FEAT_INS_EXPAND | |
| 43 | + /* May need to redraw the popup menu. */ | |
| 44 | + if (pum_visible()) | |
| 45 | + pum_redraw(); | |
| 46 | + #endif | |
| 47 | ||
| 48 | return (wp == curwin && !equalpos(curwin->w_cursor, old_cursor)); | |
| 49 | } | |
| 50 | *** ../vim-7.0.098/src/version.c Sun Sep 10 21:05:39 2006 | |
| 51 | --- src/version.c Sun Sep 10 21:35:27 2006 | |
| 52 | *************** | |
| 53 | *** 668,669 **** | |
| 54 | --- 668,671 ---- | |
| 55 | { /* Add new patch number below this line */ | |
| 56 | + /**/ | |
| 57 | + 99, | |
| 58 | /**/ | |
| 59 | ||
| 60 | -- | |
| 61 | FATHER: We are here today to witness the union of two young people in the | |
| 62 | joyful bond of the holy wedlock. Unfortunately, one of them, my son | |
| 63 | Herbert, has just fallen to his death. | |
| 64 | [Murmurs from CROWD; the BRIDE smiles with relief, coughs.] | |
| 65 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 66 | ||
| 67 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 68 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 69 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 70 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |