← Back to branch summary

~raof/qtmir/multi-bufferstream-support

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/mirsurfaceitem.h

  • Committer: CI Train Bot
  • Author(s): Daniel d'Andrada
  • Date: 2015-09-18 20:11:50 UTC
  • mfrom: (371.1.2 fixSurfaceFocus-lp1491034)
  • Revision ID: ci-train-bot@canonical.com-20150918201150-fy1hxnfno2950ifi
Update surface focus when a surface enters or leaves a MirSurfaceItem

+ Refactor MirSurfaceItem so that it talks to a MirSurfaceInterface
  instead of the concrete MirSurface class
+ Make MirSurface::setFocus() more robust Fixes: #1491034, #1495437
Approved by: PS Jenkins bot, Gerry Boland

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/mirsurfaceitem.h
26
26
// Unity API
27
27
#include <unity/shell/application/MirSurfaceItemInterface.h>
28
28
 
29
 
#include "mirsurface.h"
 
29
#include "mirsurfaceinterface.h"
30
30
#include "session_interface.h"
31
31
 
32
32
namespace qtmir {
129
129
            const QList<QTouchEvent::TouchPoint> &touchPoints,
130
130
            Qt::TouchPointStates touchPointStates);
131
131
 
132
 
    MirSurface* m_surface;
 
132
    MirSurfaceInterface* m_surface;
133
133
 
134
134
    QMutex m_mutex;
135
135
    MirTextureProvider *m_textureProvider;