Fix input controls of SearchReplace Dialog keep increasing size issue

LiMinggang · May 18, 2024 · 44982b1 · 44982b1
1 parent 37c7ab4
commit 44982b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/MadSearchReplaceDialog.cpp b/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();
@@ -1361,19 +1362,18 @@ void MadSearchReplaceDialog::MadSearchReplaceDialogActivate(wxActivateEvent& eve
 			wxString fname, enc = g_ActiveMadEdit->GetEncodingName();
 			int fsize, fsize1;
 			int times = WxSliderInputSizer->GetValue();
-			int width = 0, height = 0;
 			m_FindText->GetFont(fname, fsize);
 			g_ActiveMadEdit->GetFont(fname, fsize1);
 			m_FindText->SetEncoding(enc);
-			m_FindText->SetFont(fname, fsize);
+			m_FindText->SetFont(fname, fsize1);
 			m_FindText->SetSpellCheck(g_ActiveMadEdit->GetSpellCheckStatus());
 			m_ReplaceText->SetEncoding(enc);
-			m_ReplaceText->SetFont(fname, fsize);
+			m_ReplaceText->SetFont(fname, fsize1);
 			m_ReplaceText->SetSpellCheck(g_ActiveMadEdit->GetSpellCheckStatus());
+			times *= fsize1/fsize;
 
-			m_FindText->GetSize (&width, &height);
-			BoxSizerSearch->SetItemMinSize(m_FindText, width, height*times);
-			BoxSizerReplace->SetItemMinSize(m_ReplaceText, width, height*times);
+			BoxSizerSearch->SetItemMinSize(m_FindText, m_InputSize.GetWidth(), m_InputSize.GetHeight()*times);
+			BoxSizerReplace->SetItemMinSize(m_ReplaceText, m_InputSize.GetWidth(), m_InputSize.GetHeight()*times);
 		}
 
 		UpdateCheckBoxByCBHex(WxCheckBoxFindHex->GetValue());

diff --git a/src/MadSearchReplaceDialog.h b/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;