fix #537,reenable show() on dock creation

--this code has been checked to not break both
wayland with plasma 5.10 and x11
pull/1/head
Michail Vourlakos 8 years ago
parent a1a1f56749
commit 69c28eff7a

@ -909,8 +909,13 @@ void DockCorona::addDock(Plasma::Containment *containment, int expDockScreen)
connect(containment, &Plasma::Containment::appletAlternativesRequested connect(containment, &Plasma::Containment::appletAlternativesRequested
, this, &DockCorona::showAlternativesForApplet, Qt::QueuedConnection); , this, &DockCorona::showAlternativesForApplet, Qt::QueuedConnection);
//! Qt 5.9 creates a crash for this in wayland //! Qt 5.9 creates a crash for this in wayland, that is why the check is used
//dockView->show(); //! but on the other hand we need this for copy to work correctly and show
//! the copied dock under X11
//if (!KWindowSystem::isPlatformWayland()) {
dockView->show();
//}
m_dockViews[containment] = dockView; m_dockViews[containment] = dockView;
if (m_waitingSessionDocksCreation) { if (m_waitingSessionDocksCreation) {
@ -1244,7 +1249,7 @@ void DockCorona::copyDock(Plasma::Containment *containment)
newContainment->reactToScreenChange(); newContainment->reactToScreenChange();
} else { } else {
qDebug() << "Copy Dock in current screen..."; qDebug() << "Copy Dock in current screen...";
addDock(newContainment); addDock(newContainment, dockScrId);
} }
} }

Loading…
Cancel
Save