mirror of
https://github.com/notepad-plus-plus/notepad-plus-plus.git
synced 2025-07-24 06:14:47 +02:00
Fix close button disappeared issue in Find&Replace dialog
Fix #14940, close #14941
This commit is contained in:
parent
903d47b2eb
commit
1f4cbdb8b7
@ -410,10 +410,10 @@ protected :
|
|||||||
// Window procedure for the finder
|
// Window procedure for the finder
|
||||||
static LRESULT FAR PASCAL finderProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
|
static LRESULT FAR PASCAL finderProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
||||||
void combo2ExtendedMode(int comboID);
|
void combo2ExtendedMode(int comboID);
|
||||||
|
|
||||||
private :
|
private :
|
||||||
RECT _initialWindowRect = {};
|
RECT _initialWindowRect{};
|
||||||
LONG _deltaWidth = 0;
|
LONG _deltaWidth = 0;
|
||||||
LONG _initialClientWidth = 0;
|
LONG _initialClientWidth = 0;
|
||||||
LONG _lesssModeHeight = 0;
|
LONG _lesssModeHeight = 0;
|
||||||
@ -467,11 +467,11 @@ private :
|
|||||||
|
|
||||||
std::map<int, bool> _controlEnableMap;
|
std::map<int, bool> _controlEnableMap;
|
||||||
|
|
||||||
std::vector<int> _reduce2hide_find = { IDC_IN_SELECTION_CHECK, IDC_REPLACEINSELECTION, IDC_FINDALL_CURRENTFILE };
|
std::vector<int> _reduce2hide_find = { IDC_IN_SELECTION_CHECK, IDC_REPLACEINSELECTION, IDC_FINDALL_CURRENTFILE, IDCANCEL };
|
||||||
std::vector<int> _reduce2hide_findReplace = { IDC_IN_SELECTION_CHECK, IDC_REPLACEINSELECTION, IDREPLACEALL };
|
std::vector<int> _reduce2hide_findReplace = { IDC_IN_SELECTION_CHECK, IDC_REPLACEINSELECTION, IDREPLACEALL, IDCANCEL };
|
||||||
std::vector<int> _reduce2hide_fif = { IDD_FINDINFILES_FILTERS_STATIC, IDD_FINDINFILES_FILTERS_COMBO, IDCANCEL };
|
std::vector<int> _reduce2hide_fif = { IDD_FINDINFILES_FILTERS_STATIC, IDD_FINDINFILES_FILTERS_COMBO, IDCANCEL };
|
||||||
std::vector<int> _reduce2hide_fip = { IDD_FINDINFILES_FILTERS_STATIC, IDD_FINDINFILES_FILTERS_COMBO, IDCANCEL };
|
std::vector<int> _reduce2hide_fip = { IDD_FINDINFILES_FILTERS_STATIC, IDD_FINDINFILES_FILTERS_COMBO, IDCANCEL };
|
||||||
std::vector<int> _reduce2hide_mark = { IDC_MARKLINE_CHECK, IDC_PURGE_CHECK, IDC_IN_SELECTION_CHECK, IDC_COPY_MARKED_TEXT };
|
std::vector<int> _reduce2hide_mark = { IDC_MARKLINE_CHECK, IDC_PURGE_CHECK, IDC_IN_SELECTION_CHECK, IDC_COPY_MARKED_TEXT, IDCANCEL };
|
||||||
|
|
||||||
void enableFindDlgItem(int dlgItemID, bool isEnable = true);
|
void enableFindDlgItem(int dlgItemID, bool isEnable = true);
|
||||||
void showFindDlgItem(int dlgItemID, bool isShow = true);
|
void showFindDlgItem(int dlgItemID, bool isShow = true);
|
||||||
@ -501,7 +501,7 @@ private :
|
|||||||
void updateCombos();
|
void updateCombos();
|
||||||
void updateCombo(int comboID);
|
void updateCombo(int comboID);
|
||||||
void fillFindHistory();
|
void fillFindHistory();
|
||||||
void fillComboHistory(int id, const std::vector<generic_string> & strings);
|
void fillComboHistory(int id, const std::vector<generic_string> & strings);
|
||||||
int saveComboHistory(int id, int maxcount, std::vector<generic_string> & strings, bool saveEmpty);
|
int saveComboHistory(int id, int maxcount, std::vector<generic_string> & strings, bool saveEmpty);
|
||||||
static const int FR_OP_FIND = 1;
|
static const int FR_OP_FIND = 1;
|
||||||
static const int FR_OP_REPLACE = 2;
|
static const int FR_OP_REPLACE = 2;
|
||||||
@ -610,4 +610,3 @@ private:
|
|||||||
HWND _hBtn = nullptr;
|
HWND _hBtn = nullptr;
|
||||||
HFONT _hFont = nullptr;
|
HFONT _hFont = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user