1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
|
Index: ukui-settings-daemon-3.1.1.1/plugins/xrandr/xrandr-manager.cpp
===================================================================
--- ukui-settings-daemon-3.1.1.1.orig/plugins/xrandr/xrandr-manager.cpp
ukui-settings-daemon-3.1.1.1/plugins/xrandr/xrandr-manager.cpp
@@ -950,7 950,7 @@ void XrandrManager::outputRemoved(int ou
}
-void XrandrManager::primaryOutputChanged(const KScreen::OutputPtr &output)
void XrandrManager::primaryOutputChanged()
{
// USD_LOG(LOG_DEBUG,".");
}
@@ -1197,13 1197,13 @@ void XrandrManager::monitorsInit()
mSaveConfigTimer->start(SAVE_CONFIG_TIME);
});
- connect(output.data(), &KScreen::Output::isPrimaryChanged, this, [this](){
connect(output.data(), &KScreen::Output::priorityChanged, this, [this](){
KScreen::Output *senderOutput = static_cast<KScreen::Output*> (sender());
USD_LOG(LOG_DEBUG,"PrimaryChanged:%s",senderOutput->name().toLatin1().data());
Q_FOREACH(const KScreen::OutputPtr &output,mMonitoredConfig->data()->outputs()) {
if (output->name() == senderOutput->name()) {
- output->setPrimary(senderOutput->isPrimary());
output->setPrimary(senderOutput->priority() == 1);
break;
}
}
@@ -1289,7 1289,7 @@ void XrandrManager::monitorsInit()
this, &XrandrManager::outputRemoved,
static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::UniqueConnection));
- connect(mConfig.data(), &KScreen::Config::primaryOutputChanged,
connect(mConfig.data(), &KScreen::Config::prioritiesChanged,
this, &XrandrManager::primaryOutputChanged);
if (mMonitoredConfig->fileExists()) {
Index: ukui-settings-daemon-3.1.1.1/plugins/xrandr/xrandr-manager.h
===================================================================
--- ukui-settings-daemon-3.1.1.1.orig/plugins/xrandr/xrandr-manager.h
ukui-settings-daemon-3.1.1.1/plugins/xrandr/xrandr-manager.h
@@ -130,7 130,7 @@ public Q_SLOTS:
void RotationChangedEvent(const QString &rotation);
void outputAddedHandle(const KScreen::OutputPtr &output);
void outputRemoved(int outputId);
- void primaryOutputChanged(const KScreen::OutputPtr &output);
void primaryOutputChanged();
// void applyConfigTimerHandle();
void setScreenMode(QString modeName);
void setScreensParam(QString screensParam);
|