diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h --- a/kcms/fonts/fonts.h +++ b/kcms/fonts/fonts.h @@ -97,21 +97,22 @@ #if defined(HAVE_FONTCONFIG) && HAVE_X11 private: - int m_excludeTo; - int m_excludeToOriginal; - int m_excludeFrom; - int m_excludeFromOriginal; - int m_antiAliasing; - int m_antiAliasingOriginal; - int m_dpi; - int m_dpiOriginal; + int m_excludeTo = 0; + int m_excludeToOriginal = 0; + int m_excludeFrom = 0; + int m_excludeFromOriginal = 0; + int m_antiAliasing = 0; + int m_antiAliasingOriginal = 0; + int m_dpi = 0; + int m_dpiOriginal = 0; int m_subPixelCurrentIndex = 0; - int m_subPixelCurrentIndexOriginal; + int m_subPixelCurrentIndexOriginal = 0; int m_hintingCurrentIndex = 0; - int m_hintingCurrentIndexOriginal; + int m_hintingCurrentIndexOriginal = 0; QStandardItemModel *m_subPixelOptionsModel; QStandardItemModel *m_hintingOptionsModel; bool m_exclude = false; + bool m_excludeOriginal = false; #endif }; diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp @@ -137,6 +137,7 @@ m_excludeTo = 15; setExclude(false); } + m_excludeOriginal = m_exclude; m_excludeFromOriginal = m_excludeFrom; m_excludeToOriginal = m_excludeTo; excludeToChanged(); @@ -292,6 +293,7 @@ #endif #endif + m_excludeOriginal = m_exclude; m_excludeToOriginal = m_excludeTo; m_excludeFromOriginal = m_excludeFrom; @@ -426,7 +428,8 @@ || m_antiAliasing != m_antiAliasingOriginal || m_dpi != m_dpiOriginal || m_subPixelCurrentIndex != m_subPixelCurrentIndexOriginal - || m_hintingCurrentIndex != m_hintingCurrentIndexOriginal; + || m_hintingCurrentIndex != m_hintingCurrentIndexOriginal + || m_exclude != m_excludeOriginal; } @@ -450,6 +453,7 @@ connect(m_fontAASettings, &FontAASettings::subPixelCurrentIndexChanged, this, updateState); connect(m_fontAASettings, &FontAASettings::hintingCurrentIndexChanged, this, updateState); + connect(m_fontAASettings, &FontAASettings::excludeChanged, this, updateState); connect(m_fontAASettings, &FontAASettings::excludeToChanged, this, updateState); connect(m_fontAASettings, &FontAASettings::antiAliasingChanged, this, updateState); connect(m_fontAASettings, &FontAASettings::aliasingChanged, this, updateState);