From a6d092a221101caed71d6c4145912934de0562f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 1 Oct 2008 17:27:12 +0000 Subject: [PATCH] Better handling of hidden previews WRT backwards compatibility, since the values don't quite map to 4.1 meaning, use new values and treat old ones as the default (previews for shown windows). svn path=/trunk/KDE/kdebase/workspace/; revision=866692 --- kcmkwin/kwincompositing/advanced.cpp | 9 +++++---- options.cpp | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/kcmkwin/kwincompositing/advanced.cpp b/kcmkwin/kwincompositing/advanced.cpp index a70f68e11a..4607bfee3d 100644 --- a/kcmkwin/kwincompositing/advanced.cpp +++ b/kcmkwin/kwincompositing/advanced.cpp @@ -125,10 +125,11 @@ void KWinAdvancedCompositingOptions::load() KConfigGroup config(mKWinConfig, "Compositing"); QString backend = config.readEntry("Backend", "OpenGL"); ui.compositingType->setCurrentIndex((backend == "XRender") ? 1 : 0); - int hps = config.readEntry("HiddenPreviews", 3); - if( hps == 1 ) // always + // 4 - off, 5 - shown, 6 - always, other are old values + int hps = config.readEntry("HiddenPreviews", 5); + if( hps == 6 ) // always ui.windowThumbnails->setCurrentIndex( 0 ); - else if( hps == 0 ) // never + else if( hps == 4 ) // never ui.windowThumbnails->setCurrentIndex( 2 ); else // shown, or default ui.windowThumbnails->setCurrentIndex( 1 ); @@ -169,7 +170,7 @@ void KWinAdvancedCompositingOptions::save() } config.writeEntry("Backend", (ui.compositingType->currentIndex() == 0) ? "OpenGL" : "XRender"); - static const int hps[] = { 1 /*always*/, 3 /*shown*/, 0 /*never*/ }; + static const int hps[] = { 6 /*always*/, 5 /*shown*/, 4 /*never*/ }; config.writeEntry("HiddenPreviews", hps[ ui.windowThumbnails->currentIndex() ] ); config.writeEntry("DisableChecks", ui.disableChecks->isChecked()); diff --git a/options.cpp b/options.cpp index 8a105be038..e2f79621d8 100644 --- a/options.cpp +++ b/options.cpp @@ -227,12 +227,13 @@ void Options::reloadCompositingSettings(const CompositingPrefs& prefs) xrenderSmoothScale = config.readEntry("XRenderSmoothScale", false ); hiddenPreviews = HiddenPreviewsShown; - int hps = config.readEntry( "HiddenPreviews", 3 ); - if( hps == 0 ) + // 4 - off, 5 - shown, 6 - always, other are old values + int hps = config.readEntry( "HiddenPreviews", 5 ); + if( hps == 4 ) hiddenPreviews = HiddenPreviewsNever; - else if( hps == 3 ) + else if( hps == 5 ) hiddenPreviews = HiddenPreviewsShown; - else if( hps == 1 ) + else if( hps == 6 ) hiddenPreviews = HiddenPreviewsAlways; unredirectFullscreen = config.readEntry( "UnredirectFullscreen", true );