Use invoke method for addRepaint* methods

REVIEW: 103567
icc-effect-5.14.5
Martin Gräßlin 2012-01-15 11:39:01 +01:00
parent a38faa4329
commit 128ab01c8f
5 changed files with 22 additions and 25 deletions

View File

@ -1356,21 +1356,6 @@ void EffectWindowImpl::disablePainting(int reason)
sceneWindow()->disablePainting(reason);
}
void EffectWindowImpl::addRepaint(const QRect& r)
{
toplevel->addRepaint(r);
}
void EffectWindowImpl::addRepaint(int x, int y, int w, int h)
{
toplevel->addRepaint(x, y, w, h);
}
void EffectWindowImpl::addRepaintFull()
{
toplevel->addRepaintFull();
}
const EffectWindowGroup* EffectWindowImpl::group() const
{
if (Client* c = dynamic_cast< Client* >(toplevel))

View File

@ -234,9 +234,6 @@ public:
virtual void enablePainting(int reason);
virtual void disablePainting(int reason);
virtual bool isPaintingEnabled();
virtual void addRepaint(const QRect& r);
virtual void addRepaint(int x, int y, int w, int h);
virtual void addRepaintFull();
virtual void refWindow();
virtual void unrefWindow();

View File

@ -403,6 +403,21 @@ void EffectWindow::closeWindow() const
QMetaObject::invokeMethod(parent(), "closeWindow");
}
void EffectWindow::addRepaint(int x, int y, int w, int h)
{
QMetaObject::invokeMethod(parent(), "addRepaint", Q_ARG(int, x), Q_ARG(int, y), Q_ARG(int, w), Q_ARG(int, h));
}
void EffectWindow::addRepaint(const QRect &r)
{
QMetaObject::invokeMethod(parent(), "addRepaint", Q_ARG(const QRect&, r));
}
void EffectWindow::addRepaintFull()
{
QMetaObject::invokeMethod(parent(), "addRepaintFull");
}
bool EffectWindow::isOnCurrentActivity() const
{
return isOnActivity(effects->currentActivity());

View File

@ -1093,9 +1093,9 @@ public:
virtual void enablePainting(int reason) = 0;
virtual void disablePainting(int reason) = 0;
virtual bool isPaintingEnabled() = 0;
virtual void addRepaint(const QRect& r) = 0;
virtual void addRepaint(int x, int y, int w, int h) = 0;
virtual void addRepaintFull() = 0;
void addRepaint(const QRect& r);
void addRepaint(int x, int y, int w, int h);
void addRepaintFull();
virtual void refWindow() = 0;
virtual void unrefWindow() = 0;

View File

@ -232,10 +232,10 @@ public:
bool updateUnredirectedState();
bool unredirected() const;
void suspendUnredirect(bool suspend);
void addRepaint(const QRect& r);
void addRepaint(const QRegion& r);
void addRepaint(int x, int y, int w, int h);
virtual void addRepaintFull();
Q_INVOKABLE void addRepaint(const QRect& r);
Q_INVOKABLE void addRepaint(const QRegion& r);
Q_INVOKABLE void addRepaint(int x, int y, int w, int h);
Q_INVOKABLE virtual void addRepaintFull();
// these call workspace->addRepaint(), but first transform the damage if needed
void addWorkspaceRepaint(const QRect& r);
void addWorkspaceRepaint(int x, int y, int w, int h);