[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kscreen/apol/qxl] kded: Follow the preferred mode if we're asked to (i.e. if under QXL)
From:       Aleix Pol <null () kde ! org>
Date:       2018-09-26 22:41:49
Message-ID: E1g5IVB-0003Bd-4k () code ! kde ! org
[Download RAW message or body]

Git commit 5d2c3804003044f444d40a0da1408102b2cc7ff7 by Aleix Pol.
Committed on 26/09/2018 at 22:40.
Pushed by apol into branch 'apol/qxl'.

Follow the preferred mode if we're asked to (i.e. if under QXL)

M  +2    -3    kded/daemon.cpp

https://commits.kde.org/kscreen/5d2c3804003044f444d40a0da1408102b2cc7ff7

diff --git a/kded/daemon.cpp b/kded/daemon.cpp
index 7ae950c..a64d332 100644
--- a/kded/daemon.cpp
+++ b/kded/daemon.cpp
@@ -224,7 +224,6 @@ void KScreenDaemon::applyOsdAction(KScreen::OsdAction::Action \
action)  
 void KScreenDaemon::applyIdealConfig()
 {
-
     if (m_monitoredConfig->connectedOutputs().count() < 2) {
         m_osdManager->hideOsd();
         doApplyConfig(Generator::self()->idealConfig(m_monitoredConfig));
@@ -254,8 +253,8 @@ void KScreenDaemon::configChanged()
     // Modes may have changed, fix-up current mode id
     bool changed = false;
     Q_FOREACH(const KScreen::OutputPtr &output, m_monitoredConfig->outputs()) {
-        if (output->isConnected() && output->isEnabled() && \
                output->currentMode().isNull()) {
-            qCDebug(KSCREEN_KDED) << "Current mode" << output->currentModeId() << \
"invalid, setting preferred mode" << output->preferredModeId(); +        if \
(output->isConnected() && output->isEnabled() && (output->currentMode().isNull() || \
(output->followPreferredMode() && output->currentModeId() != \
output->preferredModeId()))) { +            qCDebug(KSCREEN_KDED) << "Current mode \
was" << output->currentModeId() << ", setting preferred mode" << \
output->preferredModeId();  output->setCurrentModeId(output->preferredModeId());
             changed = true;
         }


[prev in list] [next in list] [prev in thread] [next in thread]