[pull] master from sandboxie-plus:master

CHANGELOG.md

@@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - fixed BSOD "SYSTEM_SERVICE_EXCEPTION (3b)" when opening a DLL from AlertFolder using x64dbg [#4421](https://github.com/sandboxie-plus/Sandboxie/issues/4421)
 - fixed BSoD "CRITICAL_PROCESS_DIED" when terminate all sandboxed programs [#1316](https://github.com/sandboxie-plus/Sandboxie/issues/1316)
   - Note: we now terminate boxed processes individually instead of terminating using the job object, unless "TerminateJobObject=y" is set
+- fixed Ini Editor Font Selection Not Working After INI Highlighting Feature Added [#4429](https://github.com/sandboxie-plus/Sandboxie/issues/4429)
 
 
 

SandboxiePlus/MiscHelpers/Common/CodeEdit.cpp

@@ -57,6 +57,16 @@ CCodeEdit::CCodeEdit(QSyntaxHighlighter* pHighlighter, QWidget* pParent)
 	m_pSourceCode->addAction(m_pUnComment);*/
 }
 
+void CCodeEdit::SetFont(const QFont& Font)
+{
+	m_pSourceCode->setFont(Font);
+}
+
+const QFont& CCodeEdit::GetFont() const
+{
+	return m_pSourceCode->font();
+}
+
 #define ADD_HISTORY(list,entry)	\
 	list.removeAll(entry);		\
 	list.prepend(entry);		\

SandboxiePlus/MiscHelpers/Common/CodeEdit.h

@@ -12,6 +12,8 @@ class MISCHELPERS_EXPORT CCodeEdit : public QWidget
 
 	void				SetCode(const QString& Code)	{m_pSourceCode->setPlainText(Code);}
 	QString				GetCode()						{return m_pSourceCode->toPlainText();}
+	void				SetFont(const QFont& Font);
+	const QFont&		GetFont() const;
 
 signals:
 	void				textChanged();

SandboxiePlus/SandMan/Windows/OptionsWindow.cpp

@@ -684,9 +684,11 @@ void COptionsWindow::ApplyIniEditFont()
 {
 	QFont font; // defaults to application font
 	auto fontName = theConf->GetString("UIConfig/IniFont", "").trimmed();
-	if (!fontName.isEmpty()) bool dummy = font.fromString(fontName); // ignore fromString() fail
-	//ui.txtIniSection->setFont(font);
-	m_pCodeEdit->setFont(font);
+	if (!fontName.isEmpty()) {
+		font.fromString(fontName); // ignore fromString() fail
+		//ui.txtIniSection->setFont(font);
+		m_pCodeEdit->SetFont(font);
+	}
 }
 
 void COptionsWindow::OnSetTree()

SandboxiePlus/SandMan/Windows/SettingsWindow.cpp

@@ -666,17 +666,19 @@ void CSettingsWindow::ApplyIniEditFont()
 {
 	QFont font; // defaults to application font
 	auto fontName = theConf->GetString("UIConfig/IniFont", "").trimmed();	
-	if (!fontName.isEmpty()) bool dummy = font.fromString(fontName); // ignore fromString() fail
-	//ui.txtIniSection->setFont(font);
-	m_pCodeEdit->setFont(font);
+	if (!fontName.isEmpty()) {
+		font.fromString(fontName); // ignore fromString() fail
+	    //ui.txtIniSection->setFont(font);
+		m_pCodeEdit->SetFont(font);
+	}
 	ui.lblIniEditFont->setText(tr("%0, %1 pt").arg(font.family()).arg(font.pointSizeF())); // tr: example: "Calibri, 9.5 pt"
 }
 
 void CSettingsWindow::OnSelectIniEditFont()
 {
 	bool ok;
 	//auto newFont = QFontDialog::getFont(&ok, ui.txtIniSection->font(), this);
-	auto newFont = QFontDialog::getFont(&ok, m_pCodeEdit->font(), this);
+	auto newFont = QFontDialog::getFont(&ok, m_pCodeEdit->GetFont(), this);
 	if (!ok) return;
 	theConf->SetValue("UIConfig/IniFont", newFont.toString());
 	ApplyIniEditFont();