Merge branch 'KDE/4.7'

icc-effect-5.14.5
Martin Gräßlin 2011-06-26 18:52:18 +02:00
commit 135d835dd5
2 changed files with 7 additions and 0 deletions

View File

@ -34,6 +34,7 @@ namespace KWin
{
KWIN_EFFECT(magnifier, MagnifierEffect)
KWIN_EFFECT_SUPPORTED(magnifier, MagnifierEffect::supported())
const int FRAME_WIDTH = 5;
@ -55,6 +56,11 @@ MagnifierEffect::MagnifierEffect()
reconfigure(ReconfigureAll);
}
bool MagnifierEffect::supported()
{
return effects->compositingType() == OpenGLCompositing;
}
void MagnifierEffect::reconfigure(ReconfigureFlags)
{
KConfigGroup conf = EffectsHandler::effectConfig("Magnifier");

View File

@ -36,6 +36,7 @@ public:
virtual void prePaintScreen(ScreenPrePaintData& data, int time);
virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
virtual void postPaintScreen();
static bool supported();
private slots:
void zoomIn();
void zoomOut();