Commit 544a7c14 authored by Benjamin Port's avatar Benjamin Port

fix(kcm): show output ids in reference to currently applied config

Summary:
Currently output identification uses the pending configuration to position
output ids. That can result in output ids being inverted (if you move screen
for example).

In order to fix that, we instead use the applied configuration to identify
outputs.

Reviewers: #plasma, romangg

Reviewed By: #plasma, romangg

Subscribers: romangg, davidedmundson, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D28818
parent 538116fd
......@@ -44,6 +44,10 @@ public:
return m_config;
}
KScreen::ConfigPtr initialConfig() const {
return m_initialConfig;
}
int retention() const;
void setRetention(int retention);
......
......@@ -201,10 +201,10 @@ OutputModel* KCMKScreen::outputModel() const
void KCMKScreen::identifyOutputs()
{
if (!m_config || !m_config->config() || m_outputIdentifier) {
if (!m_config || !m_config->initialConfig() || m_outputIdentifier) {
return;
}
m_outputIdentifier.reset(new OutputIdentifier(m_config->config(), this));
m_outputIdentifier.reset(new OutputIdentifier(m_config->initialConfig(), this));
connect(m_outputIdentifier.get(), &OutputIdentifier::identifiersFinished,
this, [this]() {
m_outputIdentifier.reset();
......
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