More progress.

work/plasma6
Lana Black 8 months ago
parent 2d33519a41
commit a8573b8ba1

@ -230,6 +230,7 @@ void Corona::load()
connect(this, &Corona::availableScreenRectChangedFrom, this, &Plasma::Corona::availableScreenRectChanged, Qt::UniqueConnection);
connect(this, &Corona::availableScreenRegionChangedFrom, this, &Plasma::Corona::availableScreenRegionChanged, Qt::UniqueConnection);
//
connect(m_screenPool, &ScreenPool::primaryScreenChanged, this, &Corona::onScreenCountChanged, Qt::UniqueConnection);
QString loadLayoutName = "";
@ -648,6 +649,7 @@ QRegion Corona::availableScreenRegionWithCriteria(int id,
}
}
break;
default: break;
}
// Usually availableScreenRect is used by the desktop,

@ -176,8 +176,13 @@ signals:
void configurationShown(PlasmaQuick::ConfigView *configView);
void viewLocationChanged();
void raiseViewsTemporaryChanged();
void availableScreenRectChangedFrom(Latte::View *origin, int id);
void availableScreenRegionChangedFrom(Latte::View *origin, int id);
// FIXME:
// Old versions of these signals had Latte::View argument.
// Check if it is still needed somewhere.
// void availableScreenRectChangedFrom(Latte::View *origin, int id);
// void availableScreenRegionChangedFrom(Latte::View *origin, int id);
void availableScreenRectChangedFrom(int id);
void availableScreenRegionChangedFrom(int id);
void verticalUnityViewHasFocus();
private slots:

@ -36,7 +36,6 @@
#include <KLocalizedString>
#include <KAboutData>
#include <KDBusService>
#include <KQuickAddons/QtQuickSettings>
//! COLORS
#define CNORMAL "\e[0m"
@ -84,8 +83,6 @@ int main(int argc, char **argv)
qunsetenv("QT_QPA_PLATFORM");
}
KQuickAddons::QtQuickSettings::init();
KLocalizedString::setApplicationDomain("latte-dock");
app.setWindowIcon(QIcon::fromTheme(QStringLiteral("latte-dock")));
//protect from closing app when changing to "alternative session" and back
@ -250,11 +247,15 @@ int main(int argc, char **argv)
return 0;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
//! disable restore from session management
//! based on spectacle solution at:
//! - https://bugs.kde.org/show_bug.cgi?id=430411
//! - https://invent.kde.org/graphics/spectacle/-/commit/8db27170d63f8a4aaff09615e51e3cc0fb115c4d
// FIXME:
// Remove this later when I'm sure nothing is broken in Qt6.
QGuiApplication::setFallbackSessionManagementEnabled(false);
#endif
auto disableSessionManagement = [](QSessionManager &sm) {
sm.setRestartHint(QSessionManager::RestartNever);

Loading…
Cancel
Save