Mercurial > vim
changeset 14962:013b70517b1a v8.1.0492
patch 8.1.0492: "Edit with existing Vim" list can get long
commit https://github.com/vim/vim/commit/bf9679ae4684cb0c4e6ef2c24da0f83955d53e57
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 25 11:25:53 2018 +0200
patch 8.1.0492: "Edit with existing Vim" list can get long
Problem: "Edit with existing Vim" list can get long.
Solution: Move the list to a submenu. (Ken Takata, closes https://github.com/vim/vim/issues/3561)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 25 Oct 2018 11:30:07 +0200 |
| parents | 13402923c819 |
| children | 81993fcbec84 |
| files | src/GvimExt/gvimext.cpp src/version.c |
| diffstat | 2 files changed, 35 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/GvimExt/gvimext.cpp +++ b/src/GvimExt/gvimext.cpp @@ -708,11 +708,26 @@ STDMETHODIMP CShellExt::QueryContextMenu m_edit_existing_off = 1; } + HMENU hSubMenu = NULL; + if (m_cntOfHWnd > 1) + { + hSubMenu = CreatePopupMenu(); + mii.fMask |= MIIM_SUBMENU; + mii.wID = idCmd; + mii.dwTypeData = _("Edit with existing Vim"); + mii.cch = lstrlen(mii.dwTypeData); + mii.hSubMenu = hSubMenu; + InsertMenuItem(hMenu, indexMenu++, TRUE, &mii); + mii.fMask = mii.fMask & ~MIIM_SUBMENU; + mii.hSubMenu = NULL; + } // Now display all the vim instances for (int i = 0; i < m_cntOfHWnd; i++) { char title[BUFSIZE]; char temp[BUFSIZE]; + int index; + HMENU hmenu; // Obtain window title, continue if can not if (GetWindowText(m_hWnd[i], title, BUFSIZE - 1) == 0) @@ -726,15 +741,30 @@ STDMETHODIMP CShellExt::QueryContextMenu *pos = 0; } // Now concatenate - strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1); - temp[BUFSIZE - 1] = '\0'; + if (m_cntOfHWnd > 1) + temp[0] = '\0'; + else + { + strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1); + temp[BUFSIZE - 1] = '\0'; + } strncat(temp, title, BUFSIZE - 1 - strlen(temp)); temp[BUFSIZE - 1] = '\0'; mii.wID = idCmd++; mii.dwTypeData = temp; mii.cch = lstrlen(mii.dwTypeData); - InsertMenuItem(hMenu, indexMenu++, TRUE, &mii); + if (m_cntOfHWnd > 1) + { + hmenu = hSubMenu; + index = i; + } + else + { + hmenu = hMenu; + index = indexMenu++; + } + InsertMenuItem(hmenu, index, TRUE, &mii); } // InsertMenu(hMenu, indexMenu++, MF_SEPARATOR|MF_BYPOSITION, 0, NULL);