tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix plugin admin search issue 

Fix #12375, close #12376
This commit is contained in:
SinghRajenM 2022-10-22 11:53:00 +05:30 committed by Don Ho
parent 0bd8f6f7e0
commit 5b9cd0b2e5
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp
View File

@ -75,9 +75,9 @@ bool findStrNoCase(const generic_string & strHaystack, const generic_string & st
return (it != strHaystack.end());
}
bool PluginsAdminDlg::isFoundInAvailableListFromIndex(int index, const generic_string& str2search, bool inWhichPart) const
bool PluginsAdminDlg::isFoundInAvailableListFromIndex(const PluginViewList& inWhichList, int index, const generic_string& str2search, bool inWhichPart) const
{
PluginUpdateInfo* pui = _availableList.getPluginInfoFromUiIndex(index);
PluginUpdateInfo* pui = inWhichList.getPluginInfoFromUiIndex(index);
generic_string searchIn;
if (inWhichPart == _inNames)
searchIn = pui->_displayName;
@ -87,17 +87,17 @@ bool PluginsAdminDlg::isFoundInAvailableListFromIndex(int index, const generic_s
return (findStrNoCase(searchIn, str2search));
}
long PluginsAdminDlg::searchFromCurrentSel(const generic_string& str2search, bool inWhichPart, bool isNextMode) const
long PluginsAdminDlg::searchFromCurrentSel(const PluginViewList& inWhichList, const generic_string& str2search, bool inWhichPart, bool isNextMode) const
{
// search from curent selected item or from the beginning
long currentIndex = _availableList.getSelectedIndex();
int nbItem = static_cast<int>(_availableList.nbItem());
long currentIndex = inWhichList.getSelectedIndex();
int nbItem = static_cast<int>(inWhichList.nbItem());
if (currentIndex == -1)
{
// no selection, let's search from 0 to the end
for (int i = 0; i < nbItem; ++i)
{
if (isFoundInAvailableListFromIndex(i, str2search, inWhichPart))
if (isFoundInAvailableListFromIndex(inWhichList, i, str2search, inWhichPart))
return i;
}
}
@ -106,14 +106,14 @@ long PluginsAdminDlg::searchFromCurrentSel(const generic_string& str2search, boo
// from current position to the end
for (int i = currentIndex + (isNextMode ? 1 : 0); i < nbItem; ++i)
{
if (isFoundInAvailableListFromIndex(i, str2search, inWhichPart))
if (isFoundInAvailableListFromIndex(inWhichList, i, str2search, inWhichPart))
return i;
}
// from to begining to current position
for (int i = 0; i < currentIndex + (isNextMode ? 1 : 0); ++i)
{
if (isFoundInAvailableListFromIndex(i, str2search, inWhichPart))
if (isFoundInAvailableListFromIndex(inWhichList, i, str2search, inWhichPart))
return i;
}
}
@ -1072,14 +1072,36 @@ bool PluginsAdminDlg::searchInPlugins(bool isNextMode) const
if (lstrlen(txt2search) < 2)
return false;
long foundIndex = searchInNamesFromCurrentSel(txt2search, isNextMode);
HWND tabHandle = _tab.getHSelf();
int inWhichTab = int(::SendMessage(tabHandle, TCM_GETCURSEL, 0, 0));
const PluginViewList* inWhichList = nullptr;
switch (inWhichTab)
{
case 3:
inWhichList = &_incompatibleList;
break;
case 2:
inWhichList = &_installedList;
break;
case 1:
inWhichList = &_updateList;
break;
case 0:
default:
inWhichList = &_availableList;
break;
}
long foundIndex = searchInNamesFromCurrentSel(*inWhichList, txt2search, isNextMode);
if (foundIndex == -1)
foundIndex = searchInDescsFromCurrentSel(txt2search, isNextMode);
foundIndex = searchInDescsFromCurrentSel(*inWhichList, txt2search, isNextMode);
if (foundIndex == -1)
return false;
_availableList.setSelection(foundIndex);
inWhichList->setSelection(foundIndex);
return true;
}

12
PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h
View File

@ -212,14 +212,14 @@ private :
bool searchInPlugins(bool isNextMode) const;
const bool _inNames = true;
const bool _inDescs = false;
bool isFoundInAvailableListFromIndex(int index, const generic_string& str2search, bool inWhichPart) const;
long searchFromCurrentSel(const generic_string& str2search, bool inWhichPart, bool isNextMode) const;
long searchInNamesFromCurrentSel(const generic_string& str2search, bool isNextMode) const {
return searchFromCurrentSel(str2search, _inNames, isNextMode);
bool isFoundInAvailableListFromIndex(const PluginViewList& inWhichList,int index, const generic_string& str2search, bool inWhichPart) const;
long searchFromCurrentSel(const PluginViewList& inWhichList, const generic_string& str2search, bool inWhichPart, bool isNextMode) const;
long searchInNamesFromCurrentSel(const PluginViewList& inWhichList, const generic_string& str2search, bool isNextMode) const {
return searchFromCurrentSel(inWhichList, str2search, _inNames, isNextMode);
};
long searchInDescsFromCurrentSel(const generic_string& str2search, bool isNextMode) const {
return searchFromCurrentSel(str2search, _inDescs, isNextMode);
long searchInDescsFromCurrentSel(const PluginViewList& inWhichList, const generic_string& str2search, bool isNextMode) const {
return searchFromCurrentSel(inWhichList, str2search, _inDescs, isNextMode);
};
bool initAvailablePluginsViewFromList();