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

Merge branch 'Plasma/5.3'

Browse source
This commit is contained in:
Weng Xuetian 2015-04-21 23:27:27 -07:00
commit a23713accd
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
workspace.cpp
View file

@ -148,9 +148,6 @@ Workspace::Workspace(bool restore)
// PluginMgr needs access to the config file, so we need to wait for it for finishing // PluginMgr needs access to the config file, so we need to wait for it for finishing
reparseConfigFuture.waitForFinished(); reparseConfigFuture.waitForFinished();
// get screen support
connect(screens(), SIGNAL(changed()), SLOT(desktopResized()));
options->loadConfig(); options->loadConfig();
options->loadCompositingConfig(false); options->loadCompositingConfig(false);
ColorMapper *colormaps = new ColorMapper(this); ColorMapper *colormaps = new ColorMapper(this);
@ -218,6 +215,8 @@ void Workspace::init()
KSharedConfigPtr config = KSharedConfig::openConfig(); KSharedConfigPtr config = KSharedConfig::openConfig();
kwinApp()->createScreens(); kwinApp()->createScreens();
Screens *screens = Screens::self(); Screens *screens = Screens::self();
// get screen support
connect(screens, SIGNAL(changed()), SLOT(desktopResized()));
screens->setConfig(config); screens->setConfig(config);
screens->reconfigure(); screens->reconfigure();
connect(options, SIGNAL(configChanged()), screens, SLOT(reconfigure())); connect(options, SIGNAL(configChanged()), screens, SLOT(reconfigure()));