yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

outputconfigurationstore: don't handle laptop lid closing yet

Browse source 
Interactions with KScreen cause settings to be reset to the default when the lid
gets closed, so handling lid closing in KWin needs to wait until KScreen no longer
writes configs

BUG: 471282
This commit is contained in:
Xaver Hugl 2023-06-21 10:24:03 +02:00
parent b850e55953
commit 480f857d29
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autotests/integration/outputchanges_test.cpp
View file

@ -597,6 +597,7 @@ void OutputChangesTest::testMaximizeStateRestoredAfterEnablingOutput()
void OutputChangesTest::testLaptopLidClosed() void OutputChangesTest::testLaptopLidClosed()
{ {
QSKIP("Laptop lid handling is disabled until config writing is moved into KWin");
Test::setOutputConfig({ Test::setOutputConfig({
Test::OutputInfo{ Test::OutputInfo{
.geometry = QRect(0, 0, 1280, 1024), .geometry = QRect(0, 0, 1280, 1024),

4
src/outputconfigurationstore.cpp
View file

@ -21,6 +21,10 @@ namespace KWin
std::pair<OutputConfiguration, QVector<Output *>> OutputConfigurationStore::queryConfig(const QVector<Output *> &outputs, bool isLidClosed) std::pair<OutputConfiguration, QVector<Output *>> OutputConfigurationStore::queryConfig(const QVector<Output *> &outputs, bool isLidClosed)
{ {
// TODO to make use of isLidClosed, move config writing into KWin
// Currently, the interactions of KWin's config generation on lid close with KScreen's config writing
// causes settings changes that shouldn't be happening
isLidClosed = false;
const auto kscreenConfig = KScreenIntegration::readOutputConfig(outputs, KScreenIntegration::connectedOutputsHash(outputs, isLidClosed)); const auto kscreenConfig = KScreenIntegration::readOutputConfig(outputs, KScreenIntegration::connectedOutputsHash(outputs, isLidClosed));
if (kscreenConfig) { if (kscreenConfig) {
return kscreenConfig.value(); return kscreenConfig.value();