diff options
| author | Michael Zanetti <michael.zanetti@canonical.com> | 2015-08-20 14:16:43 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-08-26 11:44:32 +0000 |
| commit | a5fbe0230be919b9e8365dee41c29112bb67a144 (patch) | |
| tree | 81c10124c77cf53689e9d10026ddf27ff482d22e /src | |
| parent | d497b7e02d653d958197fdb6c58967df89a27940 (diff) | |
Add a temporary hotfix to work around bug 1483752
Change-Id: Ifa7334068387f0fb86b55c8b3e708b0e64c1bce0
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/Unity/Application/mirsurfaceitem.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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 { |