vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
icc-effect-5.14.5
Luboš Luňák 2008-10-01 17:27:12 +00:00
parent 79c05cde7d
commit a6d092a221
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kcmkwin/kwincompositing/advanced.cpp
View File

@ -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());

9
options.cpp
View File

@ -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 );