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

move reinitCascading to setNumberOfDesktops because it updates an internal list that is trusted to be of (at least) desktopCount_ size

Browse source 
BUG: 174118
FIXED-IN: 4.9
REVIEW: 105063
This commit is contained in:
Thomas Lübking 2012-05-26 21:06:40 +02:00
parent b61b146209
commit a6463653b9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
workspace.cpp
View file

@ -385,6 +385,9 @@ void Workspace::init()
// Create an entry with empty activity name, it will be used if activities are not supported. Otherwise, it will be removed.
m_desktopFocusChain = m_activitiesDesktopFocusChain.insert(QString(), QVector<int>(numberOfDesktops()));
// Now we know how many desktops we'll have, thus we initialize the positioning object
initPositioning = new Placement(this);
loadDesktopSettings();
updateDesktopLayout();
// Extra NETRootInfo instance in Client mode is needed to get the values of the properties
@ -402,9 +405,6 @@ void Workspace::init()
updateActivityList(false, true);
#endif
// Now we know how many desktops we'll have, thus we initialize the positioning object
initPositioning = new Placement(this);
reconfigureTimer.setSingleShot(true);
updateToolWindowsTimer.setSingleShot(true);
@ -973,7 +973,6 @@ void Workspace::slotReconfigure()
unsigned long changed = options->updateSettings();
emit configChanged();
initPositioning->reinitCascading(0);
discardPopup();
updateToolWindows(true);
@ -1698,6 +1697,7 @@ void Workspace::setNumberOfDesktops(int n)
return;
int old_number_of_desktops = numberOfDesktops();
desktopCount_ = n;
initPositioning->reinitCascading(0);
updateDesktopLayout(); // Make sure the layout is still valid
if (currentDesktop() > n)