|
|
@ -155,10 +155,6 @@ void DockView::init()
|
|
|
|
|
|
|
|
|
|
|
|
bool DockView::setCurrentScreen(const QString id)
|
|
|
|
bool DockView::setCurrentScreen(const QString id)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!m_screenToFollow || m_screenToFollow->name() == id) {
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QScreen *nextScreen{qGuiApp->primaryScreen()};
|
|
|
|
QScreen *nextScreen{qGuiApp->primaryScreen()};
|
|
|
|
|
|
|
|
|
|
|
|
if (id != "primary") {
|
|
|
|
if (id != "primary") {
|
|
|
@ -170,6 +166,10 @@ bool DockView::setCurrentScreen(const QString id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (m_screenToFollow == nextScreen) {
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (nextScreen) {
|
|
|
|
if (nextScreen) {
|
|
|
|
auto *dockCorona = qobject_cast<DockCorona *>(this->corona());
|
|
|
|
auto *dockCorona = qobject_cast<DockCorona *>(this->corona());
|
|
|
|
|
|
|
|
|
|
|
@ -184,7 +184,7 @@ bool DockView::setCurrentScreen(const QString id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DockView::setScreenToFollow(QScreen *screen)
|
|
|
|
void DockView::setScreenToFollow(QScreen *screen)
|
|
|
|