Fix input controls of SearchReplace Dialog keep increasing size issue

README.txt

@@ -126,6 +126,7 @@ Packing for FreeBSD
 .Fix bug in FindTextAll macro recording, issue #331
 .Use per monitor DPI awareness V2
 .Add ruler by sln-1550(https://github.com/sln-1550)
+.Fix input control size issue of SearchReplace dialog(sln-1550)
 .Update Astyle to 3.4.9
 .Update hunspell to 1.7.2
 .Update wxWidgets to 3.2.5

src/MadSearchReplaceDialog.cpp

@@ -329,6 +329,7 @@ MadSearchReplaceDialog::MadSearchReplaceDialog(wxWindow* parent, wxWindowID id,
 	m_FindText->SetRecordCaretMovements(false);
 	m_FindText->SetInsertSpacesInsteadOfTab(false);
 	m_FindText->SetWantTab(false);
+	m_InputSize = m_FindText->GetSize();
 	MadSyntax* syn = m_FindText->GetSyntax();
 	syn->DuplicateAttributes();
 	m_FindText->LoadDefaultSyntaxScheme();
@@ -1359,21 +1360,21 @@ void MadSearchReplaceDialog::MadSearchReplaceDialogActivate(wxActivateEvent& eve
 		if (g_ActiveMadEdit)
 		{
 			wxString fname, enc = g_ActiveMadEdit->GetEncodingName();
-			int fsize, fsize1;
+			int fsize, width = 0, height = 0;
 			int times = WxSliderInputSizer->GetValue();
-			int width = 0, height = 0;
-			m_FindText->GetFont(fname, fsize);
-			g_ActiveMadEdit->GetFont(fname, fsize1);
+
+			g_ActiveMadEdit->GetFont(fname, fsize);
 			m_FindText->SetEncoding(enc);
 			m_FindText->SetFont(fname, fsize);
 			m_FindText->SetSpellCheck(g_ActiveMadEdit->GetSpellCheckStatus());
 			m_ReplaceText->SetEncoding(enc);
 			m_ReplaceText->SetFont(fname, fsize);
 			m_ReplaceText->SetSpellCheck(g_ActiveMadEdit->GetSpellCheckStatus());
 
-			m_FindText->GetSize (&width, &height);
-			BoxSizerSearch->SetItemMinSize(m_FindText, width, height*times);
-			BoxSizerReplace->SetItemMinSize(m_ReplaceText, width, height*times);
+			WxButtonFindNext->GetSize(&width, &height);
+			height *= times;
+			BoxSizerSearch->SetItemMinSize(m_FindText, width, height);
+			BoxSizerReplace->SetItemMinSize(m_ReplaceText, width, height);
 		}
 
 		UpdateCheckBoxByCBHex(WxCheckBoxFindHex->GetValue());
@@ -2050,9 +2051,9 @@ void MadSearchReplaceDialog::WxCheckBoxRegexClick(wxCommandEvent& event)
 void MadSearchReplaceDialog::OnWxSliderInputSizerCmdScroll(wxCommandEvent& WXUNUSED(event))
 {
 	int times = WxSliderInputSizer->GetValue();
-	int width = 0, height = 0, bw, bhm;
-	WxButtonFindNext->GetSize(&bw, &bhm);
-	height = bhm * times;
+	int width = 0, height = 0;
+	WxButtonFindNext->GetSize(&width, &height);
+	height *= times;
 	BoxSizerSearch->SetItemMinSize(m_FindText, width, height);
 	BoxSizerReplace->SetItemMinSize(m_ReplaceText, width, height);
 

src/MadSearchReplaceDialog.h

@@ -95,6 +95,7 @@ class MadSearchReplaceDialog: public wxDialog
 		bool m_ReplaceDlgUi;
 
 		MadEdit *m_FindText, *m_ReplaceText;
+		wxSize m_InputSize;
 		wxBitmapButton *WxBitmapButtonRecentFindText, *WxBitmapButtonRecentReplaceText;
 		MadRecentList *m_RecentFindText;
 		MadRecentList *m_RecentReplaceText;

src/version.cpp

@@ -15,7 +15,7 @@
 #include <wx/version.h>
 
 /*\u03B1 \u03B2*/
-wxString g_MadEdit_Version(wxString(wxT("MadEdit-Mod 0.4.20"))
+wxString g_MadEdit_Version(wxString(wxT("MadEdit-Mod 0.4.21"))
 #if defined(__WXMSW__)
 #ifdef _WIN64
 	+ wxT(" win64")