yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't ask for confirmation when changing compositing settings

Browse source 
that cannot really affect whether it works or not.


svn path=/trunk/KDE/kdebase/workspace/; revision=847404
This commit is contained in:
Luboš Luňák 2008-08-15 11:10:00 +00:00
parent 49660876c1
commit 4318f74c17
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kcmkwin/kwincompositing/advanced.cpp
View file

@ -152,11 +152,22 @@ void KWinAdvancedCompositingOptions::save()
KConfigGroup config(mKWinConfig, "Compositing"); KConfigGroup config(mKWinConfig, "Compositing");
mPreviousConfig = config.entryMap(); 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"); config.writeEntry("Backend", (ui.compositingType->currentIndex() == 0) ? "OpenGL" : "XRender");
static const int hps[] = { 1 /*always*/, 3 /*shown*/, 0 /*never*/ }; static const int hps[] = { 1 /*always*/, 3 /*shown*/, 0 /*never*/ };
config.writeEntry("HiddenPreviews", hps[ ui.windowThumbnails->currentIndex() ] ); config.writeEntry("HiddenPreviews", hps[ ui.windowThumbnails->currentIndex() ] );
QString glModes[] = { "TFP", "SHM", "Fallback" };
config.writeEntry("GLMode", glModes[ui.glMode->currentIndex()]); config.writeEntry("GLMode", glModes[ui.glMode->currentIndex()]);
config.writeEntry("GLTextureFilter", ui.glTextureFilter->currentIndex()); config.writeEntry("GLTextureFilter", ui.glTextureFilter->currentIndex());
@ -168,6 +179,7 @@ void KWinAdvancedCompositingOptions::save()
enableButtonApply(false); enableButtonApply(false);
reinitKWinCompositing(); reinitKWinCompositing();
if( showConfirm )
showConfirmDialog(); showConfirmDialog();
} }