yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.14'

Browse source
This commit is contained in:
Vlad Zagorodniy 2018-10-23 16:50:12 +03:00
commit c32ffcab46
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
effects/invert/invert.cpp
View file

@ -82,19 +82,6 @@ bool InvertEffect::loadData()
return true; return true;
} }
void InvertEffect::prePaintScreen(ScreenPrePaintData &data, int time)
{
effects->prePaintScreen(data, time);
}
void InvertEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time)
{
if (m_valid && (m_allWindows != m_windows.contains(w))) {
data.mask |= PAINT_WINDOW_TRANSFORMED;
}
effects->prePaintWindow(w, data, time);
}
void InvertEffect::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) void InvertEffect::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data)
{ {
// Load if we haven't already // Load if we haven't already

9
effects/invert/invert.h
View file

@ -41,12 +41,12 @@ public:
~InvertEffect(); ~InvertEffect();
virtual void drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data); virtual void drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
virtual void prePaintScreen(ScreenPrePaintData &data, int time);
virtual void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time);
virtual void paintEffectFrame(KWin::EffectFrame* frame, QRegion region, double opacity, double frameOpacity); virtual void paintEffectFrame(KWin::EffectFrame* frame, QRegion region, double opacity, double frameOpacity);
virtual bool isActive() const; virtual bool isActive() const;
virtual bool provides(Feature); virtual bool provides(Feature);
int requestedEffectChainPosition() const override;
static bool supported(); static bool supported();
public Q_SLOTS: public Q_SLOTS:
@ -65,6 +65,11 @@ private:
QList<EffectWindow*> m_windows; QList<EffectWindow*> m_windows;
}; };
inline int InvertEffect::requestedEffectChainPosition() const
{
return 99;
}
} // namespace } // namespace
#endif #endif