summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.cpp18
1 files changed, 15 insertions, 3 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 1d01c65..259f6af 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -854,8 +854,7 @@ void LiquidStyle::polish(QWidget *w)
854 } 854 }
855 855
856 856
857 if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame )) 857
858 w-> setBackgroundOrigin ( QWidget::ParentOrigin );
859 858
860 if(w->inherits("QComboBox") || 859 if(w->inherits("QComboBox") ||
861 w->inherits("QLineEdit") || w->inherits("QRadioButton") || 860 w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
@@ -873,6 +872,7 @@ void LiquidStyle::polish(QWidget *w)
873 } 872 }
874 if(w->inherits("QButton") || w-> inherits("QComboBox")){ 873 if(w->inherits("QButton") || w-> inherits("QComboBox")){
875 w-> setBackgroundMode ( QWidget::PaletteBackground ); 874 w-> setBackgroundMode ( QWidget::PaletteBackground );
875 w->setBackgroundOrigin ( QWidget::ParentOrigin);
876 } 876 }
877 877
878 bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 || 878 bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
@@ -908,6 +908,9 @@ void LiquidStyle::polish(QWidget *w)
908 if ( flatTBButtons ) 908 if ( flatTBButtons )
909 w->setBackgroundOrigin(QWidget::ParentOrigin); 909 w->setBackgroundOrigin(QWidget::ParentOrigin);
910 } 910 }
911 if(w-> inherits("QToolBarSeparator")&&w->parent()->inherits("QToolBar")) {
912 ((QFrame *) w)-> setFrameShape ( QFrame::NoFrame );
913 }
911 if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){ 914 if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){
912 return; 915 return;
913 } 916 }
@@ -921,10 +924,19 @@ void LiquidStyle::polish(QWidget *w)
921 !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) { 924 !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) {
922 if(w->backgroundMode() == QWidget::PaletteBackground || 925 if(w->backgroundMode() == QWidget::PaletteBackground ||
923 w->backgroundMode() == QWidget::PaletteButton){ 926 w->backgroundMode() == QWidget::PaletteButton){
924 w->setBackgroundMode(QWidget::X11ParentRelative); 927 w->setBackgroundMode(w->parentWidget()->backgroundMode( )/*QWidget::X11ParentRelative*/);
928 w->setBackgroundOrigin(QWidget::ParentOrigin);
929 // w->setBackgroundMode(QWidget::NoBackground);
925 } 930 }
926 } 931 }
932 if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame ))
933 w-> setBackgroundOrigin ( QWidget::ParentOrigin );
934 else if ( w-> inherits("QFrame") )
935 w->setBackgroundOrigin ( QWidget::WidgetOrigin );
927 936
937 if ( w->parentWidget()->inherits ( "QWidgetStack" )) {
938 w->setBackgroundOrigin ( QWidget::WidgetOrigin );
939 }
928} 940}
929 941
930void LiquidStyle::unPolish(QWidget *w) 942void LiquidStyle::unPolish(QWidget *w)