move reinitCascading to setNumberOfDesktops because it updates an internal list that is trusted to be of (at least) desktopCount_ size
BUG: 174118 FIXED-IN: 4.9 REVIEW: 105063icc-effect-5.14.5
parent
b61b146209
commit
a6463653b9
|
@ -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.
|
// 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()));
|
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();
|
loadDesktopSettings();
|
||||||
updateDesktopLayout();
|
updateDesktopLayout();
|
||||||
// Extra NETRootInfo instance in Client mode is needed to get the values of the properties
|
// 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);
|
updateActivityList(false, true);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Now we know how many desktops we'll have, thus we initialize the positioning object
|
|
||||||
initPositioning = new Placement(this);
|
|
||||||
|
|
||||||
reconfigureTimer.setSingleShot(true);
|
reconfigureTimer.setSingleShot(true);
|
||||||
updateToolWindowsTimer.setSingleShot(true);
|
updateToolWindowsTimer.setSingleShot(true);
|
||||||
|
|
||||||
|
@ -973,7 +973,6 @@ void Workspace::slotReconfigure()
|
||||||
unsigned long changed = options->updateSettings();
|
unsigned long changed = options->updateSettings();
|
||||||
|
|
||||||
emit configChanged();
|
emit configChanged();
|
||||||
initPositioning->reinitCascading(0);
|
|
||||||
discardPopup();
|
discardPopup();
|
||||||
updateToolWindows(true);
|
updateToolWindows(true);
|
||||||
|
|
||||||
|
@ -1698,6 +1697,7 @@ void Workspace::setNumberOfDesktops(int n)
|
||||||
return;
|
return;
|
||||||
int old_number_of_desktops = numberOfDesktops();
|
int old_number_of_desktops = numberOfDesktops();
|
||||||
desktopCount_ = n;
|
desktopCount_ = n;
|
||||||
|
initPositioning->reinitCascading(0);
|
||||||
updateDesktopLayout(); // Make sure the layout is still valid
|
updateDesktopLayout(); // Make sure the layout is still valid
|
||||||
|
|
||||||
if (currentDesktop() > n)
|
if (currentDesktop() > n)
|
||||||
|
|
Loading…
Reference in New Issue