summaryrefslogtreecommitdiff
path: root/src/mtexturepixmapitem_p.h
diff options
context:
space:
mode:
authorKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-09-24 16:46:39 +0300
committerKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-09-24 16:52:06 +0300
commit3d67cbfce3f3c18d0ca7454c6e03a7df3a975232 (patch)
tree65dec1170e22ea8fa6f0d3698b370388cb475396 /src/mtexturepixmapitem_p.h
parentb2e2aa0593c6f6eb9f08ebcce4eba517e10b3764 (diff)
Fixes: NB#194203 - MCompositor slows down application start from the grid by 0,8s
- instead of a fixed 700 ms delay, wait for damage events before starting the startup animation - move the damage object to MWindowPropertyCache so that we can create it before mapping the window, increasing possibilities to get all damage events
Diffstat (limited to 'src/mtexturepixmapitem_p.h')
-rw-r--r--src/mtexturepixmapitem_p.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mtexturepixmapitem_p.h b/src/mtexturepixmapitem_p.h
index 2adb0ad..75bf3b2 100644
--- a/src/mtexturepixmapitem_p.h
+++ b/src/mtexturepixmapitem_p.h
@@ -24,8 +24,7 @@
#include <QRect>
#include <QRegion>
#include <QPointer>
-
-#include <X11/extensions/Xdamage.h>
+#include <X11/Xlib.h>
#ifdef GLES2_VERSION
#include <EGL/egl.h>
@@ -64,7 +63,6 @@ public:
void drawTexture(const QTransform& transform, const QRectF& drawRect, qreal opacity);
void q_drawTexture(const QTransform& transform, const QRectF& drawRect, qreal opacity);
- void damageTracking(bool enabled);
void installEffect(MCompositeWindowShaderEffect* effect);
static GLuint installPixelShader(const QByteArray& code);
@@ -87,7 +85,6 @@ public:
QRegion damageRegion;
qreal angle;
- Damage damage_object;
MTexturePixmapItem *item;
QPointer<MCompositeWindowShaderEffect> current_effect;