From a5fbe0230be919b9e8365dee41c29112bb67a144 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 20 Aug 2015 14:16:43 +0200 Subject: Add a temporary hotfix to work around bug 1483752 Change-Id: Ifa7334068387f0fb86b55c8b3e708b0e64c1bce0 Reviewed-by: Paul Olav Tvete --- src/modules/Unity/Application/mirsurfaceitem.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/modules/Unity/Application/mirsurfaceitem.cpp b/src/modules/Unity/Application/mirsurfaceitem.cpp index 8b2710c..a671c1d 100644 --- a/src/modules/Unity/Application/mirsurfaceitem.cpp +++ b/src/modules/Unity/Application/mirsurfaceitem.cpp @@ -724,6 +724,13 @@ void MirSurfaceItem::updateMirSurfaceSize() void MirSurfaceItem::updateMirSurfaceFocus(bool focused) { qCDebug(QTMIR_SURFACES) << "MirSurfaceItem::updateMirSurfaceFocus" << focused; + + // Temporary hotfix for http://pad.lv/1483752 + if (session()->childSessions()->rowCount() > 0) { + // has child trusted session, ignore any focus change attempts + return; + } + if (focused) { m_shell->set_surface_attribute(m_session->session(), m_surface, mir_surface_attrib_focus, mir_surface_focused); } else { -- cgit v1.2.3