diff --git a/krunner/krunnerdialog.cpp b/krunner/krunnerdialog.cpp index a55ed9e2..0c8326c4 100644 --- a/krunner/krunnerdialog.cpp +++ b/krunner/krunnerdialog.cpp @@ -355,18 +355,7 @@ void KRunnerDialog::hideEvent(QHideEvent *) void KRunnerDialog::updateMask() { - // Enable the mask only when compositing is disabled; - // As this operation is quite slow, it would be nice to find some - // way to workaround it for no-compositing users. - - if (KWindowSystem::compositingActive()) { - clearMask(); - const QRegion mask = m_background->mask(); - Plasma::WindowEffects::enableBlurBehind(winId(), true, mask); - Plasma::WindowEffects::overrideShadow(winId(), true); - } else { - setMask(m_background->mask()); - } + setMask(m_background->mask()); } void KRunnerDialog::resizeEvent(QResizeEvent *e) diff --git a/kstyles/oxygen/CMakeLists.txt b/kstyles/oxygen/CMakeLists.txt index acdec4a9..b85fee86 100644 --- a/kstyles/oxygen/CMakeLists.txt +++ b/kstyles/oxygen/CMakeLists.txt @@ -14,7 +14,6 @@ add_subdirectory( demo ) set(oxygen_PART_SRCS debug/oxygenwidgetexplorer.cpp - oxygenblurhelper.cpp oxygenframeshadow.cpp oxygenmdiwindowshadow.cpp oxygenmnemonics.cpp diff --git a/kstyles/oxygen/oxygenblurhelper.cpp b/kstyles/oxygen/oxygenblurhelper.cpp deleted file mode 100644 index 93accb4d..00000000 --- a/kstyles/oxygen/oxygenblurhelper.cpp +++ /dev/null @@ -1,307 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// oxygenblurhelper.cpp -// handle regions passed to kwin for blurring -// ------------------- -// -// Copyright (c) 2010 Hugo Pereira Da Costa -// -// Loosely inspired (and largely rewritten) from BeSpin style -// Copyright (C) 2007 Thomas Luebking -// -// 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 "oxygenblurhelper.h" -#include "moc_oxygenblurhelper.cpp" - -#include "oxygenstyleconfigdata.h" - -#include -#include -#include -#include - -#ifdef Q_WS_X11 -#include -#include -#include -#endif - -namespace Oxygen -{ - - //___________________________________________________________ - BlurHelper::BlurHelper( QObject* parent, StyleHelper& helper ): - QObject( parent ), - _helper( helper ), - _enabled( false ) - { - - #ifdef Q_WS_X11 - - // create atom - _blurAtom = XInternAtom( QX11Info::display(), "_KDE_NET_WM_BLUR_BEHIND_REGION", False); - _opaqueAtom = XInternAtom( QX11Info::display(), "_NET_WM_OPAQUE_REGION", False); - - #endif - - } - - //___________________________________________________________ - void BlurHelper::registerWidget( QWidget* widget ) - { - - // check if already registered - if( _widgets.contains( widget ) ) return; - - // install event filter - addEventFilter( widget ); - - // add to widgets list - _widgets.insert( widget ); - - // cleanup on destruction - connect( widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)) ); - - if( enabled() ) - { - // schedule shadow area repaint - _pendingWidgets.insert( widget, widget ); - update(); - } - - } - - //___________________________________________________________ - void BlurHelper::unregisterWidget( QWidget* widget ) - { - // remove event filter - widget->removeEventFilter( this ); - - // remove from widgets - _widgets.remove( widget ); - - if( isTransparent( widget ) ) clear( widget ); - } - - //___________________________________________________________ - bool BlurHelper::eventFilter( QObject* object, QEvent* event ) - { - - // do nothing if not enabled - if( !enabled() ) return false; - - switch( event->type() ) - { - - case QEvent::Hide: - { - QWidget* widget( qobject_cast( object ) ); - if( widget && isOpaque( widget ) && isTransparent( widget->window() ) ) - { - QWidget* window( widget->window() ); - _pendingWidgets.insert( window, window ); - update(); - } - break; - - } - - case QEvent::Show: - case QEvent::Resize: - { - - // cast to widget and check - QWidget* widget( qobject_cast( object ) ); - if( !widget ) break; - if( isTransparent( widget ) ) - { - - _pendingWidgets.insert( widget, widget ); - update(); - - } else if( isOpaque( widget ) ) { - - QWidget* window( widget->window() ); - if( isTransparent( window ) ) - { - _pendingWidgets.insert( window, window ); - update(); - } - - } - - break; - } - - default: break; - - } - - // never eat events - return false; - - } - - //___________________________________________________________ - QRegion BlurHelper::blurRegion( QWidget* widget ) const - { - - if( !widget->isVisible() ) return QRegion(); - - // get main region - QRegion region; - if( - qobject_cast( widget ) || - qobject_cast( widget ) || - qobject_cast( widget ) || - widget->inherits( "QComboBoxPrivateContainer" ) ) - { - - region = _helper.roundedMask( widget->rect() ); - - } else region = widget->mask().isEmpty() ? widget->rect():widget->mask(); - - - // trim blur region to remove unnecessary areas - trimBlurRegion( widget, widget, region ); - return region; - - } - - //___________________________________________________________ - void BlurHelper::trimBlurRegion( QWidget* parent, QWidget* widget, QRegion& region ) const - { - - - // loop over children - foreach( QObject* childObject, widget->children() ) - { - QWidget* child( qobject_cast( childObject ) ); - if( !(child && child->isVisible()) ) continue; - - if( isOpaque( child ) ) - { - - const QPoint offset( child->mapTo( parent, QPoint( 0, 0 ) ) ); - if( child->mask().isEmpty() ) - { - const QRect rect( child->rect().translated( offset ).adjusted( 1, 1, -1, -1 ) ); - region -= rect; - - } else region -= child->mask().translated( offset ); - - } else { trimBlurRegion( parent, child, region ); } - - } - - return; - - } - - //___________________________________________________________ - void BlurHelper::update( QWidget* widget ) const - { - - #ifdef Q_WS_X11 - - /* - directly from bespin code. Supposibly prevent playing with some 'pseudo-widgets' - that have winId matching some other -random- window - */ - if( !(widget->testAttribute(Qt::WA_WState_Created) || widget->internalWinId() )) - { return; } - - const QRegion blurRegion( this->blurRegion( widget ) ); - const QRegion opaqueRegion = QRegion(0, 0, widget->width(), widget->height()) - blurRegion; - if( blurRegion.isEmpty() ) { - - clear( widget ); - - } else { - - QVector data; - foreach( const QRect& rect, blurRegion.rects() ) - { data << rect.x() << rect.y() << rect.width() << rect.height(); } - - XChangeProperty( - QX11Info::display(), widget->winId(), _blurAtom, XA_CARDINAL, 32, PropModeReplace, - reinterpret_cast(data.constData()), data.size() ); - - data.clear(); - foreach( const QRect& rect, opaqueRegion.rects() ) - { data << rect.x() << rect.y() << rect.width() << rect.height(); } - - XChangeProperty( - QX11Info::display(), widget->winId(), _opaqueAtom, XA_CARDINAL, 32, PropModeReplace, - reinterpret_cast(data.constData()), data.size() ); - } - - // force update - if( widget->isVisible() ) - { widget->update(); } - - #endif - - } - - - //___________________________________________________________ - void BlurHelper::clear( QWidget* widget ) const - { - #ifdef Q_WS_X11 - XDeleteProperty( QX11Info::display(), widget->winId(), _blurAtom ); - XDeleteProperty( QX11Info::display(), widget->winId(), _opaqueAtom ); - #endif - - } - - //___________________________________________________________ - bool BlurHelper::isOpaque( const QWidget* widget ) const - { - - return - (!widget->isWindow()) && - ( (widget->autoFillBackground() && widget->palette().color( widget->backgroundRole() ).alpha() == 0xff ) || - widget->testAttribute(Qt::WA_OpaquePaintEvent) ); - - } - - //___________________________________________________________ - bool BlurHelper::isTransparent( const QWidget* widget ) const - { - - return - widget->isWindow() && - widget->testAttribute( Qt::WA_TranslucentBackground ) && - - // widgets using qgraphicsview - !( widget->graphicsProxyWidget() || - widget->inherits( "Plasma::Dialog" ) ) && - - // flags and special widgets - ( widget->testAttribute( Qt::WA_StyledBackground ) || - qobject_cast( widget ) || - qobject_cast( widget ) || - qobject_cast( widget ) || - widget->windowType() == Qt::ToolTip ) && - _helper.hasAlphaChannel( widget ); - } - -} diff --git a/kstyles/oxygen/oxygenblurhelper.h b/kstyles/oxygen/oxygenblurhelper.h deleted file mode 100644 index 1463bb3f..00000000 --- a/kstyles/oxygen/oxygenblurhelper.h +++ /dev/null @@ -1,172 +0,0 @@ -#ifndef OXYGENBLURHELPER_H -#define OXYGENBLURHELPER_H - -////////////////////////////////////////////////////////////////////////////// -// oxygenblurhelper.h -// handle regions passed to kwin for blurring -// ------------------- -// -// Copyright (c) 2010 Hugo Pereira Da Costa -// -// Loosely inspired (and largely rewritten) from BeSpin style -// Copyright (C) 2007 Thomas Luebking -// -// 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 "oxygenstylehelper.h" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#ifdef Q_WS_X11 -#include -#endif - -namespace Oxygen -{ - class BlurHelper: public QObject - { - - Q_OBJECT - - public: - - //! constructor - BlurHelper( QObject*, StyleHelper& ); - - //! destructor - virtual ~BlurHelper( void ) - {} - - //! enable state - void setEnabled( bool value ) - { _enabled = value; } - - //! enabled - bool enabled( void ) const - { return _enabled; } - - //! register widget - void registerWidget( QWidget* ); - - //! register widget - void unregisterWidget( QWidget* ); - - //! event filter - virtual bool eventFilter( QObject*, QEvent* ); - - protected: - - //! timer event - /*! used to perform delayed blur region update of pending widgets */ - virtual void timerEvent( QTimerEvent* event ) - { - - if( event->timerId() == _timer.timerId() ) - { - _timer.stop(); - update(); - } else QObject::timerEvent( event ); - - } - - //! install event filter to object, in a unique way - void addEventFilter( QObject* object ) - { - object->removeEventFilter( this ); - object->installEventFilter( this ); - } - - //! get list of blur-behind regions matching a given widget - QRegion blurRegion( QWidget* ) const; - - //! trim blur region to remove unnecessary areas (recursive) - void trimBlurRegion( QWidget*, QWidget*, QRegion& ) const; - - //! update blur region for all pending widgets - void update( void ) - { - - foreach( const WidgetPointer& widget, _pendingWidgets ) - { if( widget ) update( widget.data() ); } - - _pendingWidgets.clear(); - - } - - //! update blur regions for given widget - void update( QWidget* ) const; - - //! clear blur regions for given widget - void clear( QWidget* ) const; - - //! returns true if a given widget is opaque - bool isOpaque( const QWidget* widget ) const; - - //! true if widget is a transparent window - /*! some additional checks are performed to make sure stuff like plasma tooltips - don't get their blur region overwritten */ - bool isTransparent( const QWidget* widget ) const; - - protected slots: - - //! wiget destroyed - void widgetDestroyed( QObject* object ) - { _widgets.remove( object ); } - - private: - - //! helper - StyleHelper& _helper; - - //! enability - bool _enabled; - - //! list of widgets for which blur region must be updated - typedef QPointer WidgetPointer; - typedef QHash WidgetSet; - WidgetSet _pendingWidgets; - - //! set of registered widgets - QSet _widgets; - - //! delayed update timer - QBasicTimer _timer; - - #ifdef Q_WS_X11 - //! blur atom - Atom _blurAtom; - Atom _opaqueAtom; - #endif - - }; - -} - -#endif diff --git a/kstyles/oxygen/oxygenstyle.cpp b/kstyles/oxygen/oxygenstyle.cpp index 6a60d5b9..afbd29bb 100644 --- a/kstyles/oxygen/oxygenstyle.cpp +++ b/kstyles/oxygen/oxygenstyle.cpp @@ -49,7 +49,6 @@ #include "oxygenstyle.h" #include "moc_oxygenstyle.cpp" -#include "oxygenblurhelper.h" #include "oxygenframeshadow.h" #include "oxygenmdiwindowshadow.h" #include "oxygenmnemonics.h" @@ -168,7 +167,6 @@ namespace Oxygen _frameShadowFactory( new FrameShadowFactory( this ) ), _mdiWindowShadowFactory( new MdiWindowShadowFactory( this, *_helper ) ), _mnemonics( new Mnemonics( this ) ), - _blurHelper( new BlurHelper( this, helper() ) ), _widgetExplorer( new WidgetExplorer( this ) ), _tabBarData( new TabBarData( this ) ), _frameFocusPrimitive( 0 ), @@ -442,7 +440,6 @@ namespace Oxygen frameShadowFactory().unregisterWidget( widget ); mdiWindowShadowFactory().unregisterWidget( widget ); shadowHelper().unregisterWidget( widget ); - blurHelper().unregisterWidget( widget ); if( isKTextEditFrame( widget ) ) { widget->setAttribute( Qt::WA_Hover, false ); } @@ -3357,8 +3354,6 @@ namespace Oxygen const bool hasAlpha( helper().hasAlphaChannel( widget ) ); if( hasAlpha && StyleConfigData::toolTipTransparent() ) { - if( widget && widget->window() ) - { blurHelper().registerWidget( widget->window() ); } topColor.setAlpha( 220 ); bottomColor.setAlpha( 220 ); } @@ -7390,9 +7385,6 @@ namespace Oxygen helper().setMaxCacheSize( cacheSize ); - // always enable blur helper - blurHelper().setEnabled( true ); - // reinitialize engines windowManager().initialize(); shadowHelper().reloadConfig(); diff --git a/kstyles/oxygen/oxygenstyle.h b/kstyles/oxygen/oxygenstyle.h index bc6b8843..457654f5 100644 --- a/kstyles/oxygen/oxygenstyle.h +++ b/kstyles/oxygen/oxygenstyle.h @@ -76,7 +76,6 @@ namespace Oxygen class Transitions; class WindowManager; class WidgetExplorer; - class BlurHelper; //! toplevel manager class TopLevelManager: public QObject @@ -355,10 +354,6 @@ namespace Oxygen MdiWindowShadowFactory& mdiWindowShadowFactory( void ) const { return *_mdiWindowShadowFactory; } - //! blur helper - BlurHelper& blurHelper( void ) const - { return *_blurHelper; } - //! mdi window shadows Mnemonics& mnemonics( void ) const { return *_mnemonics; } @@ -839,9 +834,6 @@ namespace Oxygen //! keyboard accelerators Mnemonics* _mnemonics; - //! blur helper - BlurHelper* _blurHelper; - //! widget explorer WidgetExplorer* _widgetExplorer; diff --git a/kwin/clients/aurorae/src/aurorae.cpp b/kwin/clients/aurorae/src/aurorae.cpp index 3454558c..9da70070 100644 --- a/kwin/clients/aurorae/src/aurorae.cpp +++ b/kwin/clients/aurorae/src/aurorae.cpp @@ -202,8 +202,6 @@ bool AuroraeFactory::supports(Ability ability) const return true; // TODO: correct value from theme case AbilityTabbing: return false; - case AbilityUsesBlurBehind: - return true; default: return false; } diff --git a/kwin/decorations.cpp b/kwin/decorations.cpp index 3f7cbabc..8fd8fd97 100644 --- a/kwin/decorations.cpp +++ b/kwin/decorations.cpp @@ -107,14 +107,6 @@ bool DecorationPlugin::supportsFrameOverlap() const return factory()->supports(AbilityExtendIntoClientArea); } -bool DecorationPlugin::supportsBlurBehind() const -{ - if (m_disabled) { - return false; - } - return factory()->supports(AbilityUsesBlurBehind); -} - Qt::Corner DecorationPlugin::closeButtonCorner() { if (m_disabled) { @@ -156,8 +148,6 @@ QString DecorationPlugin::supportInformation() support.append("Frame Overlap: "); support.append(supportsFrameOverlap() ? "yes\n" : "no\n"); - support.append("Blur Behind: "); - support.append(supportsBlurBehind() ? "yes\n" : "no\n"); // TODO: Qt5 - read support information from Factory return support; } diff --git a/kwin/decorations.h b/kwin/decorations.h index b1d4c31a..ac8607a8 100644 --- a/kwin/decorations.h +++ b/kwin/decorations.h @@ -44,7 +44,6 @@ public: bool supportsAnnounceAlpha() const; bool supportsTabbing() const; bool supportsFrameOverlap() const; - bool supportsBlurBehind() const; Qt::Corner closeButtonCorner(); QString supportInformation(); diff --git a/kwin/effects.cpp b/kwin/effects.cpp index 3739eac2..c1b88771 100644 --- a/kwin/effects.cpp +++ b/kwin/effects.cpp @@ -485,16 +485,6 @@ bool EffectsHandlerImpl::hasDecorationShadows() const return decorationPlugin()->hasShadows(); } -bool EffectsHandlerImpl::decorationsHaveAlpha() const -{ - return decorationPlugin()->hasAlpha(); -} - -bool EffectsHandlerImpl::decorationSupportsBlurBehind() const -{ - return decorationPlugin()->supportsBlurBehind(); -} - // start another painting pass void EffectsHandlerImpl::startPaint() { diff --git a/kwin/effects.h b/kwin/effects.h index c22d8e0e..f3fb7c66 100644 --- a/kwin/effects.h +++ b/kwin/effects.h @@ -161,10 +161,6 @@ public: virtual bool hasDecorationShadows() const; - virtual bool decorationsHaveAlpha() const; - - virtual bool decorationSupportsBlurBehind() const; - virtual EffectFrame* effectFrame(bool staticSize, const QPoint& position, Qt::Alignment alignment) const; virtual QVariant kwinOption(KWinOption kwopt); diff --git a/kwin/libkdecorations/kdecoration.h b/kwin/libkdecorations/kdecoration.h index 034fea77..db71bfa4 100644 --- a/kwin/libkdecorations/kdecoration.h +++ b/kwin/libkdecorations/kdecoration.h @@ -212,13 +212,11 @@ public: /// region, when the blur plugin is enabled. /// @since 4.3 AbilityExtendIntoClientArea = 13, ///< The decoration respects transparentRect() - /// @since 4.4 - AbilityUsesBlurBehind = 14, ///< The decoration wants the background to be blurred, when the blur plugin is enabled. /// @since 4.6 - AbilityAnnounceAlphaChannel = 15, ///< The decoration can tell whether it currently uses an alpha channel or not. Requires AbilityUsesAlphaChannel. + AbilityAnnounceAlphaChannel = 14, ///< The decoration can tell whether it currently uses an alpha channel or not. Requires AbilityUsesAlphaChannel. /// @since 4.10 // Tabbing - AbilityTabbing = 16, ///< The decoration supports tabbing + AbilityTabbing = 15, ///< The decoration supports tabbing }; /** diff --git a/kwin/libkwineffects/kwineffects.h b/kwin/libkwineffects/kwineffects.h index c8db5dd1..cb5d49d6 100644 --- a/kwin/libkwineffects/kwineffects.h +++ b/kwin/libkwineffects/kwineffects.h @@ -601,14 +601,6 @@ class KWIN_EXPORT EffectsHandler : public QObject */ Q_PROPERTY(qreal animationTimeFactor READ animationTimeFactor) Q_PROPERTY(QList< KWin::EffectWindow* > stackingOrder READ stackingOrder) - /** - * Whether window decorations use the alpha channel. - **/ - Q_PROPERTY(bool decorationsHaveAlpha READ decorationsHaveAlpha) - /** - * Whether the window decorations support blurring behind the decoration. - **/ - Q_PROPERTY(bool decorationSupportsBlurBehind READ decorationSupportsBlurBehind) Q_PROPERTY(CompositingType compositingType READ compositingType CONSTANT) Q_PROPERTY(QPoint cursorPos READ cursorPos) friend class Effect; @@ -844,18 +836,6 @@ public: */ virtual bool hasDecorationShadows() const = 0; - /** - * Returns @a true if the window decorations use the alpha channel, and @a false otherwise. - * @since 4.5 - */ - virtual bool decorationsHaveAlpha() const = 0; - - /** - * Returns @a true if the window decorations support blurring behind the decoration, and @a false otherwise - * @since 4.6 - */ - virtual bool decorationSupportsBlurBehind() const = 0; - /** * Creates a new frame object. If the frame does not have a static size * then it will be located at @a position with @a alignment. A diff --git a/plasma/applets/folderview/dialog.cpp b/plasma/applets/folderview/dialog.cpp index 160775bd..a15b2d22 100644 --- a/plasma/applets/folderview/dialog.cpp +++ b/plasma/applets/folderview/dialog.cpp @@ -30,7 +30,6 @@ #include #include -#include #ifdef Q_WS_X11 # include @@ -45,13 +44,7 @@ Dialog::Dialog(QWidget *parent) #ifdef Q_WS_X11 setAttribute(Qt::WA_X11NetWmWindowTypeDropDownMenu); - - if (KWindowSystem::compositingActive()) { - setAttribute(Qt::WA_NoSystemBackground, false); - Plasma::WindowEffects::overrideShadow(winId(), true); - } else { - setAttribute(Qt::WA_NoSystemBackground); - } + setAttribute(Qt::WA_NoSystemBackground, KWindowSystem::compositingActive()); #endif KWindowSystem::setState(effectiveWinId(), NET::SkipTaskbar | NET::SkipPager); @@ -156,11 +149,7 @@ void Dialog::resizeEvent(QResizeEvent *event) m_background->resizeFrame(rect().size()); m_view->setGeometry(contentsRect()); - if (KWindowSystem::compositingActive()) { - Plasma::WindowEffects::enableBlurBehind(winId(), true, m_background->mask()); - } else { - setMask(m_background->mask()); - } + setMask(m_background->mask()); } void Dialog::paintEvent(QPaintEvent *event) diff --git a/plasma/applets/folderview/popupview.cpp b/plasma/applets/folderview/popupview.cpp index c1cd7185..da63fbd3 100644 --- a/plasma/applets/folderview/popupview.cpp +++ b/plasma/applets/folderview/popupview.cpp @@ -89,7 +89,6 @@ PopupView::PopupView(const QModelIndex &index, const QPoint &pos, } #endif - KWindowSystem::setState(effectiveWinId(), NET::SkipTaskbar | NET::SkipPager); setAcceptDrops(true); @@ -138,8 +137,6 @@ PopupView::PopupView(const QModelIndex &index, const QPoint &pos, pt.ry() = available.top(); } - Plasma::WindowEffects::overrideShadow(winId(), true); - move(pt); show(); @@ -530,11 +527,7 @@ void PopupView::resizeEvent(QResizeEvent *event) m_view->setGeometry(contentsRect()); } - if (KWindowSystem::compositingActive()) { - Plasma::WindowEffects::enableBlurBehind(winId(), true, m_background->mask()); - } else { - setMask(m_background->mask()); - } + setMask(m_background->mask()); } void PopupView::showEvent(QShowEvent *event) diff --git a/plasma/containments/panel/panel.cpp b/plasma/containments/panel/panel.cpp index 050c280c..fc48461a 100644 --- a/plasma/containments/panel/panel.cpp +++ b/plasma/containments/panel/panel.cpp @@ -588,7 +588,6 @@ void Panel::paintInterface(QPainter *painter, if (containmentOpt && containmentOpt->view && !m_background->mask().isEmpty()) { const QRegion mask = m_background->mask(); containmentOpt->view->setMask(mask); - Plasma::WindowEffects::enableBlurBehind(containmentOpt->view->winId(), true, mask); } } diff --git a/plasma/dataengines/weather/weatherengine.cpp b/plasma/dataengines/weather/weatherengine.cpp index 828384f4..c4949ce0 100644 --- a/plasma/dataengines/weather/weatherengine.cpp +++ b/plasma/dataengines/weather/weatherengine.cpp @@ -219,7 +219,7 @@ bool WeatherEngine::updateSourceEvent(const QString& source) void WeatherEngine::networkStatusChanged(Solid::Networking::Status status) { - kDebug(); + kDebug() << status; m_networkAvailable = status == Solid::Networking::Connected || status == Solid::Networking::Unknown; if (m_networkAvailable) { // allow the network to settle down and actually come up diff --git a/plasma/shells/plasma-desktop/controllerwindow.cpp b/plasma/shells/plasma-desktop/controllerwindow.cpp index 51a70529..66ba1afb 100644 --- a/plasma/shells/plasma-desktop/controllerwindow.cpp +++ b/plasma/shells/plasma-desktop/controllerwindow.cpp @@ -69,7 +69,6 @@ ControllerWindow::ControllerWindow(QWidget* parent) pal.setBrush(backgroundRole(), Qt::transparent); setPalette(pal); - Plasma::WindowEffects::overrideShadow(winId(), true); m_panelShadow = new PanelShadows(this); m_panelShadow->setImagePath("dialogs/background"); @@ -486,8 +485,6 @@ void ControllerWindow::resizeEvent(QResizeEvent * event) { m_background->resizeFrame(size()); - Plasma::WindowEffects::enableBlurBehind(effectiveWinId(), true, m_background->mask()); - // qDebug() << "ControllerWindow::resizeEvent" << event->oldSize(); QWidget::resizeEvent(event); diff --git a/plasma/shells/plasma-windowed/plasmaapp.cpp b/plasma/shells/plasma-windowed/plasmaapp.cpp index a881fc84..d751f78d 100644 --- a/plasma/shells/plasma-windowed/plasmaapp.cpp +++ b/plasma/shells/plasma-windowed/plasmaapp.cpp @@ -162,7 +162,6 @@ int PlasmaApp::newInstance() view->viewport()->setAutoFillBackground(false); view->setAttribute(Qt::WA_NoSystemBackground); view->viewport()->setAttribute(Qt::WA_NoSystemBackground); - Plasma::WindowEffects::overrideShadow(view->winId(), true); } if (args->isSet("fullscreen")) { diff --git a/plasma/shells/plasma-windowed/singleview.cpp b/plasma/shells/plasma-windowed/singleview.cpp index eec18815..afc340a6 100644 --- a/plasma/shells/plasma-windowed/singleview.cpp +++ b/plasma/shells/plasma-windowed/singleview.cpp @@ -149,16 +149,6 @@ void SingleView::updateGeometry() setSceneRect(m_applet->sceneBoundingRect()); } - - if ((windowFlags() & Qt::FramelessWindowHint) && - applet()->backgroundHints() != Plasma::Applet::NoBackground) { - - // TODO: Use the background's mask for blur - QRegion mask; - mask += QRect(QPoint(), size()); - - Plasma::WindowEffects::enableBlurBehind(winId(), true, mask); - } } #include "moc_singleview.cpp" diff --git a/systemsettings/app/ToolTips/ktooltipwindow.cpp b/systemsettings/app/ToolTips/ktooltipwindow.cpp index 3505501c..1f711ebe 100644 --- a/systemsettings/app/ToolTips/ktooltipwindow.cpp +++ b/systemsettings/app/ToolTips/ktooltipwindow.cpp @@ -55,10 +55,4 @@ void KToolTipWindow::paintEvent(QPaintEvent* event) QWidget::paintEvent(event); } -void KToolTipWindow::showEvent(QShowEvent *) -{ - Plasma::WindowEffects::overrideShadow(winId(), true); - Plasma::WindowEffects::enableBlurBehind(winId(), true, mask()); -} - #include "moc_ktooltipwindow_p.cpp" diff --git a/systemsettings/app/ToolTips/ktooltipwindow_p.h b/systemsettings/app/ToolTips/ktooltipwindow_p.h index f5dd9a84..dc60b230 100644 --- a/systemsettings/app/ToolTips/ktooltipwindow_p.h +++ b/systemsettings/app/ToolTips/ktooltipwindow_p.h @@ -34,7 +34,6 @@ public: protected: virtual void paintEvent(QPaintEvent* event); - virtual void showEvent(QShowEvent *); }; #endif