diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-15 22:25:11 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-15 22:25:11 +0000 |
| commit | c1d059ab57cfcc43d0c6052fdb5e6782ce23dac5 (patch) | |
| tree | 2872594fe1bcce846c057941ad40aaacd715b44c | |
| parent | 34869df7a3d0fb0dbf63885fb9421df772d953ee (diff) | |
| download | tdebase-c1d059ab.tar.gz tdebase-c1d059ab.zip | |
Fix Unified splash screen
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253867 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | ksplashml/themeengine/themeengine.cpp | 7 | ||||
| -rw-r--r-- | ksplashml/themeengine/themeengine.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index f88bee8d9..9d86f264c 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -41,7 +41,7 @@ struct ThemeEngine::ThemeEnginePrivate }; ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args ) - : TQVBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), d(0) + : TQVBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), d(0), mUseWM(false) { d = new ThemeEnginePrivate; kapp->installX11EventFilter( this ); @@ -56,6 +56,9 @@ ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args ) mTheme = new ObjKsTheme( "Default" ); else mTheme = new ObjKsTheme( args.first() ); + if (args.first() == "Unified") { + mUseWM = true; + } mTheme->loadCmdLineArgs( KCmdLineArgs::parsedArgs() ); } @@ -89,7 +92,7 @@ void ThemeEngine::addSplashWindow( TQWidget* w ) return; if( d->mSplashWindows.contains( w->winId())) return; - if( !w->testWFlags( WX11BypassWM )) + if( !w->testWFlags( WX11BypassWM ) && (mUseWM == false)) { // All toplevel widgets should be probably required to be WX11BypassWM // for KDE4 instead of this ugly hack. static_cast< HackWidget* >( w )->setWFlags( WX11BypassWM ); diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h index 0ffb0f72b..026351b5b 100644 --- a/ksplashml/themeengine/themeengine.h +++ b/ksplashml/themeengine/themeengine.h @@ -78,6 +78,7 @@ private slots: private: class ThemeEnginePrivate; ThemeEnginePrivate *d; + bool mUseWM; }; #endif |