diff --git a/kstyle/CMakeLists.txt b/kstyle/CMakeLists.txt
index 7e90a130..6b95c401 100644
--- a/kstyle/CMakeLists.txt
+++ b/kstyle/CMakeLists.txt
@@ -128,7 +128,6 @@ set(breeze_PART_SRCS
animations/breezewidgetstateengine.cpp
animations/breezewidgetstatedata.cpp
debug/breezewidgetexplorer.cpp
- breezeblurhelper.cpp
breezeaddeventfilter.cpp
breezeframeshadow.cpp
breezehelper.cpp
diff --git a/kstyle/breeze.kcfg b/kstyle/breeze.kcfg
index 1a20350f..bd2cc407 100644
--- a/kstyle/breeze.kcfg
+++ b/kstyle/breeze.kcfg
@@ -40,7 +40,7 @@
-
+
true
@@ -97,7 +97,7 @@
true
-
+
true
@@ -185,11 +185,6 @@
false
-
-
- 100
-
-
diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
index cb0d3e8b..ea3fceb5 100644
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@@ -30,7 +30,6 @@
#include "breezestyleconfigdata.h"
#include "breezewidgetexplorer.h"
#include "breezewindowmanager.h"
-#include "breezeblurhelper.h"
#include
@@ -153,7 +152,6 @@ namespace Breeze
, _helper( new Helper( "breeze" ) )
#else
, _helper( new Helper( StyleConfigData::self()->sharedConfig() ) )
- , _blurHelper( new BlurHelper( this ) )
#endif
, _shadowHelper( new ShadowHelper( this, *_helper ) )
@@ -319,12 +317,6 @@ namespace Breeze
setTranslucentBackground( widget );
- #if !BREEZE_USE_KDE4
- if ( _helper->hasAlphaChannel( widget ) && StyleConfigData::menuOpacity() < 100 ) {
- _blurHelper->registerWidget( widget->window() );
- }
- #endif
-
#if QT_VERSION >= 0x050000
} else if( qobject_cast( widget ) ) {
@@ -447,10 +439,6 @@ namespace Breeze
_windowManager->unregisterWidget( widget );
_splitterFactory->unregisterWidget( widget );
- #if !BREEZE_USE_KDE4
- _blurHelper->unregisterWidget( widget );
- #endif
-
// remove event filter
if( qobject_cast( widget ) ||
qobject_cast( widget ) ||
@@ -3621,6 +3609,7 @@ namespace Breeze
//___________________________________________________________________________________
bool Style::drawPanelMenuPrimitive( const QStyleOption* option, QPainter* painter, const QWidget* widget ) const
{
+
/*
* do nothing if menu is embedded in another widget
* this corresponds to having a transparent background
@@ -3628,16 +3617,10 @@ namespace Breeze
if( widget && !widget->isWindow() ) return true;
const auto& palette( option->palette );
+ const auto background( _helper->frameBackgroundColor( palette ) );
const auto outline( _helper->frameOutlineColor( palette ) );
- const bool hasAlpha( _helper->hasAlphaChannel( widget ) );
- auto background( _helper->frameBackgroundColor( palette ) );
-
- #if !BREEZE_USE_KDE4
- if ( hasAlpha ) {
- background.setAlphaF(StyleConfigData::menuOpacity() / 100.0);
- }
- #endif
+ const bool hasAlpha( _helper->hasAlphaChannel( widget ) );
_helper->renderMenuFrame( painter, option->rect, background, outline, hasAlpha );
return true;
diff --git a/kstyle/breezestyle.h b/kstyle/breezestyle.h
index c9ac1221..12548c92 100644
--- a/kstyle/breezestyle.h
+++ b/kstyle/breezestyle.h
@@ -66,7 +66,6 @@ namespace Breeze
class SplitterFactory;
class WidgetExplorer;
class WindowManager;
- class BlurHelper;
//* convenience typedef for base class
#if BREEZE_USE_KDE4
@@ -498,9 +497,6 @@ namespace Breeze
//* keyboard accelerators
Mnemonics* _mnemonics = nullptr;
- //* blur helper
- BlurHelper* _blurHelper = nullptr;
-
//* window manager
WindowManager* _windowManager = nullptr;
diff --git a/kstyle/config/breezestyleconfig.cpp b/kstyle/config/breezestyleconfig.cpp
index 6fb5302a..ee761ef6 100644
--- a/kstyle/config/breezestyleconfig.cpp
+++ b/kstyle/config/breezestyleconfig.cpp
@@ -64,7 +64,6 @@ namespace Breeze
connect( _scrollBarAddLineButtons, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
connect( _scrollBarSubLineButtons, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
connect( _windowDragMode, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
- connect( _menuOpacity, SIGNAL(valueChanged(int)), SLOT(updateChanged()) );
}
@@ -85,8 +84,7 @@ namespace Breeze
StyleConfigData::setScrollBarSubLineButtons( _scrollBarSubLineButtons->currentIndex() );
StyleConfigData::setAnimationsEnabled( _animationsEnabled->isChecked() );
StyleConfigData::setAnimationsDuration( _animationsDuration->value() );
- StyleConfigData::setWindowDragMode( _windowDragMode->currentIndex() );
- StyleConfigData::setMenuOpacity( _menuOpacity->value() );
+ StyleConfigData::setWindowDragMode( _windowDragMode->currentIndex() );
#if BREEZE_USE_KDE4
StyleConfigData::self()->writeConfig();
@@ -149,7 +147,6 @@ namespace Breeze
else if( _animationsEnabled->isChecked() != StyleConfigData::animationsEnabled() ) modified = true;
else if( _animationsDuration->value() != StyleConfigData::animationsDuration() ) modified = true;
else if( _windowDragMode->currentIndex() != StyleConfigData::windowDragMode() ) modified = true;
- else if( _menuOpacity->value() != StyleConfigData::menuOpacity() ) modified = true;
emit changed(modified);
@@ -174,7 +171,6 @@ namespace Breeze
_animationsEnabled->setChecked( StyleConfigData::animationsEnabled() );
_animationsDuration->setValue( StyleConfigData::animationsDuration() );
_windowDragMode->setCurrentIndex( StyleConfigData::windowDragMode() );
- _menuOpacity->setValue( StyleConfigData::menuOpacity() );
}
diff --git a/kstyle/config/ui/breezestyleconfig.ui b/kstyle/config/ui/breezestyleconfig.ui
index 30fb9131..ee33a114 100644
--- a/kstyle/config/ui/breezestyleconfig.ui
+++ b/kstyle/config/ui/breezestyleconfig.ui
@@ -6,16 +6,10 @@
0
0
- 562
- 264
+ 522
+ 257
-
-
- 0
- 0
-
-
0
@@ -183,7 +177,7 @@
false
- A&nimations duration:
+ Anima&tions duration:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -386,140 +380,6 @@
-
-
- Transparency
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
- Transparent
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Opaque
-
-
-
-
-
- -
-
-
-
-
-
- Menu:
-
-
-
- -
-
-
- 0
-
-
- 100
-
-
- 1
-
-
- 10
-
-
- 100
-
-
- Qt::Horizontal
-
-
- false
-
-
- false
-
-
- QSlider::TicksBelow
-
-
- 10
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Preferred
-
-
-
- 542
- 20
-
-
-
-
-
-