From 4318f74c176d9802d2748cd269cfc21613e2032a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Fri, 15 Aug 2008 11:10:00 +0000 Subject: [PATCH] Don't ask for confirmation when changing compositing settings that cannot really affect whether it works or not. svn path=/trunk/KDE/kdebase/workspace/; revision=847404 --- kcmkwin/kwincompositing/advanced.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/kcmkwin/kwincompositing/advanced.cpp b/kcmkwin/kwincompositing/advanced.cpp index 602d1fef62..d119388682 100644 --- a/kcmkwin/kwincompositing/advanced.cpp +++ b/kcmkwin/kwincompositing/advanced.cpp @@ -152,11 +152,22 @@ void KWinAdvancedCompositingOptions::save() KConfigGroup config(mKWinConfig, "Compositing"); mPreviousConfig = config.entryMap(); + bool showConfirm = false; + QString glModes[] = { "TFP", "SHM", "Fallback" }; + + if( config.readEntry("Backend", "OpenGL") + != ((ui.compositingType->currentIndex() == 0) ? "OpenGL" : "XRender") + || config.readEntry("GLMode", "TFP") != glModes[ui.glMode->currentIndex()] + || config.readEntry("GLDirect", mDefaultPrefs->enableDirectRendering()) + != ui.glDirect->isChecked() + || config.readEntry("GLVSync", mDefaultPrefs->enableVSync()) != ui.glVSync->isChecked()) + { + showConfirm = true; + } config.writeEntry("Backend", (ui.compositingType->currentIndex() == 0) ? "OpenGL" : "XRender"); static const int hps[] = { 1 /*always*/, 3 /*shown*/, 0 /*never*/ }; config.writeEntry("HiddenPreviews", hps[ ui.windowThumbnails->currentIndex() ] ); - QString glModes[] = { "TFP", "SHM", "Fallback" }; config.writeEntry("GLMode", glModes[ui.glMode->currentIndex()]); config.writeEntry("GLTextureFilter", ui.glTextureFilter->currentIndex()); @@ -168,7 +179,8 @@ void KWinAdvancedCompositingOptions::save() enableButtonApply(false); reinitKWinCompositing(); - showConfirmDialog(); + if( showConfirm ) + showConfirmDialog(); } void KWinAdvancedCompositingOptions::reinitKWinCompositing()