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

Properly reload compositing settings on reconfigure.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=716806
This commit is contained in:
Luboš Luňák 2007-09-25 09:41:23 +00:00
parent aa26125635
commit 8985ca0b7f
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
composite.cpp
View file

@ -66,11 +66,6 @@ namespace KWin
void Workspace::setupCompositing() void Workspace::setupCompositing()
{ {
#if defined( HAVE_XCOMPOSITE ) && defined( HAVE_XDAMAGE ) #if defined( HAVE_XCOMPOSITE ) && defined( HAVE_XDAMAGE )
// Driver-specific config detection
CompositingPrefs prefs;
prefs.detect();
options->reloadCompositingSettings( prefs );
if( !options->useCompositing ) if( !options->useCompositing )
{ {
kDebug( 1212 ) << "Compositing is turned off in options"; kDebug( 1212 ) << "Compositing is turned off in options";

5
options.cpp
View file

@ -201,6 +201,11 @@ unsigned long Options::updateSettings()
// QToolTip::setGloballyEnabled( d->show_tooltips ); // QToolTip::setGloballyEnabled( d->show_tooltips );
// KDE4 this probably needs to be done manually in clients // KDE4 this probably needs to be done manually in clients
// Driver-specific config detection
CompositingPrefs prefs;
prefs.detect();
reloadCompositingSettings( prefs );
return changed; return changed;
} }

2
options.h
View file

@ -34,7 +34,6 @@ class Options : public KDecorationOptions
~Options(); ~Options();
virtual unsigned long updateSettings(); virtual unsigned long updateSettings();
void reloadCompositingSettings(const CompositingPrefs& prefs);
/*! /*!
Different focus policies: Different focus policies:
@ -339,6 +338,7 @@ class Options : public KDecorationOptions
QStringList ignoreFocusStealingClasses; QStringList ignoreFocusStealingClasses;
MouseCommand wheelToMouseCommand( MouseWheelCommand com, int delta ); MouseCommand wheelToMouseCommand( MouseWheelCommand com, int delta );
void reloadCompositingSettings(const CompositingPrefs& prefs);
}; };
extern Options* options; extern Options* options;