diff --git a/kstyle/breezeblurhelper.cpp b/kstyle/breezeblurhelper.cpp index 56109e4f..3a428378 100644 --- a/kstyle/breezeblurhelper.cpp +++ b/kstyle/breezeblurhelper.cpp @@ -1,111 +1,106 @@ ////////////////////////////////////////////////////////////////////////////// // breezeblurhelper.cpp // handle regions passed to kwin for blurring // ------------------- // // Copyright (C) 2018 Alex Nemeth // // Largely rewritten from Oxygen widget style // Copyright (C) 2007 Thomas Luebking // Copyright (c) 2010 Hugo Pereira Da Costa // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to // deal in the Software without restriction, including without limitation the // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or // sell copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: // // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. // // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. ////////////////////////////////////////////////////////////////////////////// #include "breezeblurhelper.h" #include "breezestyleconfigdata.h" #include #include #include namespace Breeze { //___________________________________________________________ BlurHelper::BlurHelper(QObject* parent): QObject(parent) { } //___________________________________________________________ void BlurHelper::registerWidget(QWidget* widget) { // install event filter addEventFilter(widget); // schedule shadow area repaint update(widget); } //___________________________________________________________ void BlurHelper::unregisterWidget(QWidget* widget) { // remove event filter widget->removeEventFilter(this); } //___________________________________________________________ bool BlurHelper::eventFilter(QObject* object, QEvent* event) { switch (event->type()) { case QEvent::Hide: case QEvent::Show: case QEvent::Resize: { // cast to widget and check QWidget* widget(qobject_cast(object)); if (!widget) break; update(widget); break; } default: break; } // never eat events return false; } //___________________________________________________________ void BlurHelper::update(QWidget* widget) const { - #if BREEZE_HAVE_X11 /* directly from bespin code. Supposedly prevent playing with some 'pseudo-widgets' that have winId matching some other -random- window */ if (!(widget->testAttribute(Qt::WA_WState_Created) || widget->internalWinId())) return; KWindowEffects::enableBlurBehind(widget->winId(), true); // force update if (widget->isVisible()) { widget->update(); } - - #else - Q_UNUSED( widget ) - #endif } } diff --git a/kstyle/breezeblurhelper.h b/kstyle/breezeblurhelper.h index c2ae336d..9db1c158 100644 --- a/kstyle/breezeblurhelper.h +++ b/kstyle/breezeblurhelper.h @@ -1,80 +1,76 @@ #ifndef breezeblurhelper_h #define breezeblurhelper_h ////////////////////////////////////////////////////////////////////////////// // breezeblurhelper.h // handle regions passed to kwin for blurring // ------------------- // // Copyright (C) 2018 Alex Nemeth // // Largely rewritten from Oxygen widget style // Copyright (C) 2007 Thomas Luebking // Copyright (c) 2010 Hugo Pereira Da Costa // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to // deal in the Software without restriction, including without limitation the // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or // sell copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: // // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. // // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. ////////////////////////////////////////////////////////////////////////////// #include "breeze.h" #include "breezehelper.h" #include #include -#if BREEZE_HAVE_X11 -#include -#endif - namespace Breeze { class BlurHelper: public QObject { Q_OBJECT public: //! constructor BlurHelper( QObject* ); //! register widget void registerWidget( QWidget* ); //! register widget void unregisterWidget( QWidget* ); //! event filter bool eventFilter( QObject*, QEvent* ) override; protected: //! install event filter to object, in a unique way void addEventFilter( QObject* object ) { object->removeEventFilter( this ); object->installEventFilter( this ); } //! update blur regions for given widget void update( QWidget* ) const; }; } #endif