Merge lp:~loic.molinari/qtmir/qtmir-dont-render-negative-items into lp:qtmir

Proposed by Loïc Molinari
Status: Merged
Approved by: Gerry Boland
Approved revision: 399
Merged at revision: 415
Proposed branch: lp:~loic.molinari/qtmir/qtmir-dont-render-negative-items
Merge into: lp:qtmir
Diff against target: 12 lines (+1/-1)
1 file modified
src/modules/Unity/Application/mirsurfaceitem.cpp (+1/-1)
To merge this branch: bzr merge lp:~loic.molinari/qtmir/qtmir-dont-render-negative-items
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+276472@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
2--- src/modules/Unity/Application/mirsurfaceitem.cpp 2015-10-13 18:29:13 +0000
3+++ src/modules/Unity/Application/mirsurfaceitem.cpp 2015-11-02 22:31:00 +0000
4@@ -208,7 +208,7 @@
5 {
6 QMutexLocker mutexLocker(&m_mutex);
7
8- if (!m_surface) {
9+ if (!m_surface || width() <= 0 || height() <= 0) {
10 if (m_textureProvider) {
11 m_textureProvider->releaseTexture();
12 }

Subscribers

People subscribed via source and target branches