Commit 03bd0348 authored by Michail Vourlakos's avatar Michail Vourlakos

fix user changing screen behavior

--wait for the actual screen change to really
happen in order to reshow the dock afterwards

BUG:433876
parent 15cf2b2b
......@@ -124,7 +124,7 @@ void Positioner::init()
connect(this, &Positioner::showDockAfterLocationChangeFinished, this, &Positioner::syncLatteViews);
connect(this, &Positioner::showDockAfterScreenChangeFinished, this, &Positioner::syncLatteViews);
connect(this, &Positioner::showDockAfterMovingToLayoutFinished, this, &Positioner::syncLatteViews);
connect(this, &Positioner::showDockAfterMovingToLayoutFinished, this, &Positioner::syncLatteViews);
connect(m_view, &Latte::View::onPrimaryChanged, this, &Positioner::syncLatteViews);
connect(this, &Positioner::inSlideAnimationChanged, this, [&]() {
......@@ -160,7 +160,7 @@ void Positioner::init()
connect(m_view, &QQuickWindow::widthChanged, this, &Positioner::validateDockGeometry);
connect(m_view, &QQuickWindow::heightChanged, this, &Positioner::validateDockGeometry);
connect(m_view, &QQuickWindow::screenChanged, this, &Positioner::currentScreenChanged);
connect(m_view, &QQuickWindow::screenChanged, this, &Positioner::screenChanged);
connect(m_view, &QQuickWindow::screenChanged, this, &Positioner::onScreenChanged);
connect(m_view, &Latte::View::behaveAsPlasmaPanelChanged, this, &Positioner::syncGeometry);
connect(m_view, &Latte::View::maxThicknessChanged, this, &Positioner::syncGeometry);
......@@ -210,8 +210,8 @@ void Positioner::init()
}
});
connect(qGuiApp, &QGuiApplication::screenAdded, this, &Positioner::screenChanged);
connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &Positioner::screenChanged);
connect(qGuiApp, &QGuiApplication::screenAdded, this, &Positioner::onScreenChanged);
connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &Positioner::onScreenChanged);
connect(m_view, &Latte::View::visibilityChanged, this, &Positioner::initDelayedSignals);
......@@ -444,7 +444,7 @@ void Positioner::reconsiderScreen()
qDebug() << "reconsiderScreen() ended...";
}
void Positioner::screenChanged(QScreen *scr)
void Positioner::onScreenChanged(QScreen *scr)
{
m_screenSyncTimer.start();
......@@ -916,15 +916,16 @@ void Positioner::initSignalingForLocationChangeSliding()
//! signals to handle the sliding-in/out during screen changes
connect(this, &Positioner::hideDockDuringScreenChangeStarted, this, &Positioner::onHideWindowsForSlidingOut);
connect(this, &Positioner::currentScreenChanged, this, [&]() {
if (m_goToScreen) {
connect(m_view, &QQuickView::screenChanged, this, [&]() {
if (m_goToScreen
&& m_goToScreen == m_view->screen()
&& m_goToScreen->geometry().contains(m_view->geometry().center())) {
//! make sure that View has been repositioned properly in next screen and show view afterwards
m_goToScreen = nullptr;
QTimer::singleShot(100, [this]() {
m_view->effects()->setAnimationsBlocked(false);
emit showDockAfterScreenChangeFinished();
m_view->showSettingsWindow();
emit edgeChanged();
});
m_view->effects()->setAnimationsBlocked(false);
emit showDockAfterScreenChangeFinished();
m_view->showSettingsWindow();
emit edgeChanged();
}
});
......@@ -947,6 +948,7 @@ void Positioner::initSignalingForLocationChangeSliding()
}
});
//! ---- both cases ---- !//
//! this is used for both location and screen change cases, this signal
//! is send when the sliding-out animation has finished
......
......@@ -137,7 +137,7 @@ signals:
void isStickedOnBottomEdgeChanged();
private slots:
void screenChanged(QScreen *screen);
void onScreenChanged(QScreen *screen);
void onCurrentLayoutIsSwitching(const QString &layoutName);
void validateDockGeometry();
......
......@@ -272,6 +272,11 @@ View::~View()
void View::init(Plasma::Containment *plasma_containment)
{
connect(this, &QQuickWindow::xChanged, this, &View::geometryChanged);
connect(this, &QQuickWindow::yChanged, this, &View::geometryChanged);
connect(this, &QQuickWindow::widthChanged, this, &View::geometryChanged);
connect(this, &QQuickWindow::heightChanged, this, &View::geometryChanged);
connect(this, &QQuickWindow::xChanged, this, &View::xChanged);
connect(this, &QQuickWindow::xChanged, this, &View::updateAbsoluteGeometry);
connect(this, &QQuickWindow::yChanged, this, &View::yChanged);
......
......@@ -311,6 +311,7 @@ signals:
void extendedInterfaceChanged();
void fontPixelSizeChanged();
void forcedShown(); //[workaround] forced shown to avoid a KWin issue that hides windows when closing activities
void geometryChanged();
void widthChanged();
void headThicknessGapChanged();
void heightChanged();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment