[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kicker
From:       Waldo Bastian <bastian () kde ! org>
Date:       2003-07-03 20:34:02
[Download RAW message or body]

CVS commit by waba: 

Fix alignment of background.


  M +4 -5      buttons/panelbuttonbase.cpp   1.38
  M +1 -0      core/container_button.cpp   1.40
  M +3 -0      core/containerarea.cpp   1.148


--- kdebase/kicker/buttons/panelbuttonbase.cpp  #1.37:1.38
@@ -66,5 +66,4 @@ PanelButtonBase::PanelButtonBase(QWidget
   , _size((KIcon::StdSizes)-1), _zoom_size((KIcon::StdSizes)-1)
 {
-    setBackgroundOrigin( WindowOrigin );
     calculateIconSizes();
 
@@ -416,7 +415,9 @@ void PanelButtonBase::dropEvent(QDropEve
 void PanelButtonBase::loadTiles()
 {
-    if (_tile.isNull())
+    if (_tile.isNull()) {
+        setBackgroundOrigin( AncestorOrigin );
         _up = _down = QPixmap();
-    else {
+    } else {
+        setBackgroundOrigin( WidgetOrigin );
         // If only the tiles were named a bit smarter we wouldn't have
         // to pass the up or down argument.
@@ -434,6 +435,4 @@ void PanelButtonBase::drawButton(QPainte
     if (!_bg.isNull())
         p->drawPixmap(0, 0, _bg);
-    else
-        p->fillRect(rect(), colorGroup().brush(QColorGroup::Background));
 
     const QPixmap& tile = (isDown() || isOn()) ? _down : _up;

--- kdebase/kicker/core/container_button.cpp  #1.39:1.40
@@ -57,4 +57,5 @@ ButtonContainer::ButtonContainer(QPopupM
   , _oldpos(0,0)
 {
+     setBackgroundOrigin( AncestorOrigin );
 }
 

--- kdebase/kicker/core/containerarea.cpp  #1.147:1.148
@@ -78,4 +78,7 @@ ContainerArea::ContainerArea( KConfig* _
     , _transparent(false)
 {
+    setBackgroundOrigin( WidgetOrigin );
+    viewport()->setBackgroundOrigin( WidgetOrigin );
+
     setAcceptDrops( !Kicker::kicker()->isImmutable() );
     connect(&_autoScrollTimer, SIGNAL(timeout()), SLOT(autoScroll()));


[prev in list] [next in list] [prev in thread] [next in thread]