From 1f4cbdb8b76c736c9ec1e69d4157c9650fd6f590 Mon Sep 17 00:00:00 2001 From: ozone10 Date: Fri, 5 Apr 2024 08:05:47 +0200 Subject: [PATCH] Fix close button disappeared issue in Find&Replace dialog Fix #14940, close #14941 --- PowerEditor/src/ScintillaComponent/FindReplaceDlg.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.h index 7925fe990..93c8a7117 100644 --- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.h +++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.h @@ -410,10 +410,10 @@ protected : // Window procedure for the finder static LRESULT FAR PASCAL finderProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); - void combo2ExtendedMode(int comboID); + void combo2ExtendedMode(int comboID); private : - RECT _initialWindowRect = {}; + RECT _initialWindowRect{}; LONG _deltaWidth = 0; LONG _initialClientWidth = 0; LONG _lesssModeHeight = 0; @@ -467,11 +467,11 @@ private : std::map _controlEnableMap; - std::vector _reduce2hide_find = { IDC_IN_SELECTION_CHECK, IDC_REPLACEINSELECTION, IDC_FINDALL_CURRENTFILE }; - std::vector _reduce2hide_findReplace = { IDC_IN_SELECTION_CHECK, IDC_REPLACEINSELECTION, IDREPLACEALL }; + std::vector _reduce2hide_find = { IDC_IN_SELECTION_CHECK, IDC_REPLACEINSELECTION, IDC_FINDALL_CURRENTFILE, IDCANCEL }; + std::vector _reduce2hide_findReplace = { IDC_IN_SELECTION_CHECK, IDC_REPLACEINSELECTION, IDREPLACEALL, IDCANCEL }; std::vector _reduce2hide_fif = { IDD_FINDINFILES_FILTERS_STATIC, IDD_FINDINFILES_FILTERS_COMBO, IDCANCEL }; std::vector _reduce2hide_fip = { IDD_FINDINFILES_FILTERS_STATIC, IDD_FINDINFILES_FILTERS_COMBO, IDCANCEL }; - std::vector _reduce2hide_mark = { IDC_MARKLINE_CHECK, IDC_PURGE_CHECK, IDC_IN_SELECTION_CHECK, IDC_COPY_MARKED_TEXT }; + std::vector _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 showFindDlgItem(int dlgItemID, bool isShow = true); @@ -501,7 +501,7 @@ private : void updateCombos(); void updateCombo(int comboID); void fillFindHistory(); - void fillComboHistory(int id, const std::vector & strings); + void fillComboHistory(int id, const std::vector & strings); int saveComboHistory(int id, int maxcount, std::vector & strings, bool saveEmpty); static const int FR_OP_FIND = 1; static const int FR_OP_REPLACE = 2; @@ -610,4 +610,3 @@ private: HWND _hBtn = nullptr; HFONT _hFont = nullptr; }; -