← Back to branch summary

~unity-team/qtmir/kbdLayout

« back to all changes in this revision

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

  • Committer: CI Train Bot
  • Author(s): Daniel d'Andrada
  • Date: 2015-12-10 13:08:38 UTC
  • mfrom: (423.3.1 origin/multiSurfaceApp2)
  • Revision ID: ci-train-bot@canonical.com-20151210130838-11ftzh83klgfnm74
Make Session hold multiple surfaces

+ Standardize MirSurface debug messages and account for multiple surfaces per app
Approved by: Gerry Boland

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/mirsurfaceitem.cpp
236
236
    QSGDefaultImageNode *node = static_cast<QSGDefaultImageNode*>(oldNode);
237
237
    if (!node) {
238
238
        node = new QSGDefaultImageNode;
239
 
        node->setTexture(m_textureProvider->texture());
240
 
 
241
239
        node->setMipmapFiltering(QSGTexture::None);
242
240
        node->setHorizontalWrapMode(QSGTexture::ClampToEdge);
243
241
        node->setVerticalWrapMode(QSGTexture::ClampToEdge);
246
244
            node->markDirty(QSGNode::DirtyMaterial);
247
245
        }
248
246
    }
 
247
    node->setTexture(m_textureProvider->texture());
249
248
 
250
249
    if (m_fillMode == PadOrCrop) {
251
250
        const QSize &textureSize = m_textureProvider->texture()->textureSize();