shell/scripting: Consider current activity in `desktopForScreen`

This fixes "Change Wallpaper..." in System Settings unable to open the
config dialog when the current activity is not the default one.

BUG: 452561
wilder-5.25
Fushan Wen 4 years ago committed by Nate Graham
parent ddcedbc0b9
commit f994e1301f
  1. 6
      shell/scripting/scriptengine_v1.cpp

@ -188,8 +188,10 @@ QJSValue ScriptEngine::V1::desktopForScreen(const QJSValue &param) const
} }
const uint screen = param.toInt(); const uint screen = param.toInt();
const auto containments = m_engine->m_corona->containmentsForScreen(screen); // "null": don't create a containment if it doesn't exist,
return m_engine->wrap(containments.empty() ? nullptr : containments[0]); // return nullptr instead.
const auto containment = m_engine->m_corona->containmentForScreen(screen, currentActivity(), QStringLiteral("null"));
return m_engine->wrap(containment);
} }
QJSValue ScriptEngine::V1::screenForConnector(const QJSValue &param) const QJSValue ScriptEngine::V1::screenForConnector(const QJSValue &param) const

Loading…
Cancel
Save