Rather than storing wl_output when creating a HomeScreenHandler object,
retrieve the output at activation. Presumably, we could use Screen and
from there get it but seems to be easier this way.
Re-plugging the connector back and forth would result in a stale wl_output,
so this would retrieve it always as the currently enabled/active one.
Bug-AGL: SPEC-4705
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Id54c1f253b094e196c6bd367c7419c0ec5860d5f
mp_launcher = launcher;
mp_applauncher_client = new AppLauncherClient();
QPlatformNativeInterface *native = qApp->platformNativeInterface();
mp_launcher = launcher;
mp_applauncher_client = new AppLauncherClient();
QPlatformNativeInterface *native = qApp->platformNativeInterface();
- m_output = getWlOutput(native, qApp->screens().first());
//
// The "started" event is received any time a start request is made to applaunchd,
//
// The "started" event is received any time a start request is made to applaunchd,
void HomescreenHandler::activateApp(const QString& app_id)
{
struct agl_shell *agl_shell = aglShell->shell.get();
void HomescreenHandler::activateApp(const QString& app_id)
{
struct agl_shell *agl_shell = aglShell->shell.get();
+ QPlatformNativeInterface *native = qApp->platformNativeInterface();
+ struct wl_output *mm_output = getWlOutput(native, qApp->screens().first());
if (mp_launcher) {
mp_launcher->setCurrent(app_id);
}
HMI_DEBUG("HomeScreen", "Activating application %s", app_id.toStdString().c_str());
if (mp_launcher) {
mp_launcher->setCurrent(app_id);
}
HMI_DEBUG("HomeScreen", "Activating application %s", app_id.toStdString().c_str());
- agl_shell_activate_app(agl_shell, app_id.toStdString().c_str(), m_output);
+
+ agl_shell_activate_app(agl_shell, app_id.toStdString().c_str(), mm_output);
}
void HomescreenHandler::deactivateApp(const QString& app_id)
}
void HomescreenHandler::deactivateApp(const QString& app_id)
private:
ApplicationLauncher *mp_launcher;
AppLauncherClient *mp_applauncher_client;
private:
ApplicationLauncher *mp_launcher;
AppLauncherClient *mp_applauncher_client;
- struct wl_output *m_output;