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

Fix Column Editor OK button not disabled if Text-to-Insert is empty

Browse Source 
Fix #13315
This commit is contained in:
Don Ho 2023-04-06 23:43:08 +02:00
parent 6326340ccb
commit 81db72afb3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/ScintillaComponent/columnEditor.cpp
View File

@ -378,8 +378,8 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR
case EN_CHANGE: case EN_CHANGE:
{ {
ColumnEditorParam& colEditParam = NppParameters::getInstance()._columnEditParam; ColumnEditorParam& colEditParam = NppParameters::getInstance()._columnEditParam;
const int stringSize = MAX_PATH; constexpr int stringSize = MAX_PATH;
TCHAR str[stringSize]; TCHAR str[stringSize]{};
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {
@ -387,6 +387,7 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR
{ {
::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize); ::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize);
colEditParam._insertedTextContent = str; colEditParam._insertedTextContent = str;
::EnableWindow(::GetDlgItem(_hSelf, IDOK), str[0]);
return TRUE; return TRUE;
} }
case IDC_COL_INITNUM_EDIT: case IDC_COL_INITNUM_EDIT:
@ -474,6 +475,7 @@ void ColumnEditorDlg::switchTo(bool toText)
::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_OCT_RADIO), !toText); ::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_OCT_RADIO), !toText);
::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_BIN_RADIO), !toText); ::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_BIN_RADIO), !toText);
::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_LEADING_COMBO), !toText); ::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_LEADING_COMBO), !toText);
::EnableWindow(::GetDlgItem(_hSelf, IDOK), !toText || !NppParameters::getInstance()._columnEditParam._insertedTextContent.empty());
::SetFocus(toText?hText:hNum); ::SetFocus(toText?hText:hNum);