tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-28 00:04:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression of multiple selections in comboboxes of Find dialog

Browse Source 
The regression was introduced from commit e25e15b9b25afee7f56fe6e02ef4a314468f6d7b

Fix #15583, close #15587
This commit is contained in:
ozone10 2024-08-28 16:17:15 +02:00 committed by Don Ho
parent 446cc980e8
commit bdf3ccaca9
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -1181,7 +1181,8 @@ void FindReplaceDlg::resizeDialogElements()
const bool isLessModeOn = NppParameters::getInstance().getNppGUI()._findWindowLessMode; const bool isLessModeOn = NppParameters::getInstance().getNppGUI()._findWindowLessMode;
//elements that need to be resized horizontally (all edit/combo boxes etc.) //elements that need to be resized horizontally (all edit/combo boxes etc.)
const auto resizeWindowIDs = { IDFINDWHAT, IDREPLACEWITH, IDD_FINDINFILES_FILTERS_COMBO, IDD_FINDINFILES_DIR_COMBO }; const std::vector<int> resizeWindowIDs = { IDFINDWHAT, IDREPLACEWITH, IDD_FINDINFILES_FILTERS_COMBO, IDD_FINDINFILES_DIR_COMBO };
const size_t nComboboxes = resizeWindowIDs.size();
//elements that need to be moved //elements that need to be moved
const auto moveCheckIds = { const auto moveCheckIds = {
@ -1275,24 +1276,20 @@ void FindReplaceDlg::resizeDialogElements()
getMappedChildRect(hSwapBtn, rcSwapBtn); getMappedChildRect(hSwapBtn, rcSwapBtn);
nCtrls = resizeWindowIDs.size() + moveLaterIDs.size() + (isLessModeOn ? 0 : moveTransIDs.size()) + 1; // 1 is for tab control nCtrls = nComboboxes + moveLaterIDs.size() + (isLessModeOn ? 0 : moveTransIDs.size()) + 1; // 1 is for tab control
hdwp = ::BeginDeferWindowPos(static_cast<int>(nCtrls)); hdwp = ::BeginDeferWindowPos(static_cast<int>(nCtrls));
for (int id : resizeWindowIDs) std::vector<DWORD> endSelections(nComboboxes, 0);
for (size_t i = 0; i < nComboboxes; ++i)
{ {
HWND resizeHwnd = ::GetDlgItem(_hSelf, id); HWND resizeHwnd = ::GetDlgItem(_hSelf, resizeWindowIDs[i]);
getMappedChildRect(resizeHwnd, rcTmp); getMappedChildRect(resizeHwnd, rcTmp);
// Combo box for some reasons selects text on resize. So let's check before resize if selection is present and clear it manually after resize. // Combo box for some reasons selects text on resize. So let's check before resize if selection is present and clear it manually after resize.
DWORD endSelection = 0; ::SendMessage(resizeHwnd, CB_GETEDITSEL, 0, reinterpret_cast<LPARAM>(&endSelections[i]));
::SendMessage(resizeHwnd, CB_GETEDITSEL, 0, reinterpret_cast<LPARAM>(&endSelection));
hdwp = setOrDeferWindowPos(hdwp, resizeHwnd, nullptr, 0, 0, rcSwapBtn.left - rcTmp.left - gap, rcTmp.bottom - rcTmp.top, SWP_NOMOVE | flags); hdwp = setOrDeferWindowPos(hdwp, resizeHwnd, nullptr, 0, 0, rcSwapBtn.left - rcTmp.left - gap, rcTmp.bottom - rcTmp.top, SWP_NOMOVE | flags);
if (endSelection == 0)
{
::SendMessage(resizeHwnd, CB_SETEDITSEL, 0, 0);
}
} }
RECT rcFPrevBtn{}; RECT rcFPrevBtn{};
@ -1347,6 +1344,15 @@ void FindReplaceDlg::resizeDialogElements()
if (hdwp) if (hdwp)
::EndDeferWindowPos(hdwp); ::EndDeferWindowPos(hdwp);
for (size_t i = 0; i < nComboboxes ; ++i)
{
if (endSelections[i] == 0)
{
HWND resizeHwnd = ::GetDlgItem(_hSelf, resizeWindowIDs[i]);
::SendMessage(resizeHwnd, CB_SETEDITSEL, 0, 0);
}
}
::SetWindowPos(::GetDlgItem(_hSelf, IDFINDWHAT), nullptr, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_FRAMECHANGED | flags); ::SetWindowPos(::GetDlgItem(_hSelf, IDFINDWHAT), nullptr, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_FRAMECHANGED | flags);
} }