[calamares] Avoid deprecated desktop()

- Put Calamares on the first screen where it fits
 - This is wordy and weird
main
Adriaan de Groot 5 years ago
parent 43caf7b46a
commit 121013fd96

@ -39,6 +39,7 @@
#include <QDesktopWidget>
#include <QDir>
#include <QFileInfo>
#include <QScreen>
#include <QTimer>
@ -359,7 +360,17 @@ CalamaresApplication::initView()
if ( Calamares::Branding::instance() && Calamares::Branding::instance()->windowPlacementCentered() )
{
m_mainwindow->move( this->desktop()->availableGeometry().center() - m_mainwindow->rect().center() );
QList< QScreen* > screens = qApp->screens();
QPoint windowCenter = m_mainwindow->rect().center();
for ( const auto* screen : screens )
{
QPoint screenCenter = screen->availableGeometry().center();
if ( ( screenCenter.x() >= windowCenter.x() ) && ( screenCenter.y() >= windowCenter.y() ) )
{
m_mainwindow->move( screenCenter - windowCenter );
break;
}
}
}
cDebug() << "STARTUP: CalamaresWindow created; loadModules started";
}

Loading…
Cancel
Save