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

Treat CompositingPrefs::enableCompositing() merely as a recommendation again

Browse source 
like it was before. This makes it possible to enable compositing again on my
R600 hardware and other hardware that is not explicitly known to work.
I also think that CompositingPrefs::enableCompositing() is a (really) bad name:
it's not about user preferences and it's not definitive. So what about
CompositingHardware::isKnownToWork()?.

svn path=/trunk/KDE/kdebase/workspace/; revision=1058198
This commit is contained in:
Andreas Hartmetz 2009-12-04 08:31:28 +00:00
parent 82f6efa7d0
commit 601233bcc1
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compositingprefs.h
View file

@ -54,7 +54,7 @@ public:
static bool compositingPossible();
static QString compositingNotPossibleReason();
bool validateSetup( CompositingType compositingType ) const;
bool enableCompositing() const;
bool enableCompositing() const; // recommendCompositing()?
bool enableVSync() const { return mEnableVSync; }
bool enableDirectRendering() const { return mEnableDirectRendering; }
bool strictBinding() const { return mStrictBinding; }

12
options.cpp
View file

@ -58,8 +58,8 @@ Options::~Options()
unsigned long Options::updateSettings()
{
KSharedConfig::Ptr _config = KGlobal::config();
unsigned long changed = 0;
changed |= KDecorationOptions::updateSettings( _config.data() ); // read decoration settings
// read decoration settings
const unsigned long changed = KDecorationOptions::updateSettings( _config.data() );
KConfigGroup config( _config, "Windows" );
moveMode = stringToMoveResizeMode( config.readEntry("MoveMode", "Opaque" ));
@ -229,12 +229,8 @@ void Options::reloadCompositingSettings()
// Compositing settings
CompositingPrefs prefs;
useCompositing = config.readEntry("Enabled", true);
if (useCompositing)
{
prefs.detect();
useCompositing = prefs.enableCompositing();
}
prefs.detect();
useCompositing = config.readEntry("Enabled", prefs.enableCompositing());
if (!useCompositing)
return;