← Back to branch summary

~mterry/qtmir/warn-on-xapp

« 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-11-25 15:38:54 UTC
  • mfrom: (417.1.1 trunk)
  • Revision ID: ci-train-bot@canonical.com-20151125153854-ovxuurth1go5dfb0
Revert revision 415

The commit "Ensured Mir surface items with size less than or equal to zero are not rendered,
as it's usually done for standard QtQuick items." caused a regression.

MirSurface.size was being kept uninitialized, as QSize(-1,-1).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/mirsurfaceitem.cpp
211
211
{
212
212
    QMutexLocker mutexLocker(&m_mutex);
213
213
 
214
 
    if (!m_surface || width() <= 0 || height() <= 0) {
 
214
    if (!m_surface) {
215
215
        if (m_textureProvider) {
216
216
            m_textureProvider->releaseTexture();
217
217
        }