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

Remove the fallback to Platik in case defaultDepth is < 8

Browse source 
Plastik has been removed and the new Aurorae has the same requirement as
Oxygen. This fallback was anyway useless given that KWin nowadays uses
raster paint engine by default and hardly anything would work with such a
small QPixmap::defaultDepth().

REVIEW: 106613
This commit is contained in:
Martin Gräßlin 2012-10-12 08:25:22 +02:00
parent a85ff67deb
commit aa34dbd059
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -176,12 +176,11 @@ void KWinDecorationModule::readConfig(const KConfigGroup & conf)
// Find the corresponding decoration name to that of
// the current plugin library name
QString libraryName = conf.readEntry("PluginLib",
((QPixmap::defaultDepth() > 8) ? "kwin3_oxygen" : "kwin3_plastik"));
QString libraryName = conf.readEntry("PluginLib", "kwin3_oxygen");
if (libraryName.isEmpty()) {
// Selected decoration doesn't exist, use the default
libraryName = ((QPixmap::defaultDepth() > 8) ? "kwin3_oxygen" : "kwin3_plastik");
libraryName = "kwin3_oxygen";
}
const int bsize = conf.readEntry("BorderSize", (int)BorderNormal);

5
plugins.cpp
View file

@ -34,10 +34,9 @@ PluginMgr::PluginMgr()
: KDecorationPlugins(KGlobal::config())
, m_noDecoration(false)
{
defaultPlugin = (QPixmap::defaultDepth() > 8) ?
"kwin3_oxygen" : "kwin3_plastik";
defaultPlugin = "kwin3_oxygen";
#ifndef KWIN_BUILD_OXYGEN
defaultPlugin = "kwin3_plastik";
defaultPlugin = "kwin3_aurorae";
#endif
#ifdef KWIN_BUILD_DECORATIONS
loadPlugin(""); // load the plugin specified in cfg file