Fix for background drawing to make taskbar look nice with liquid style

2 files changed, 5 insertions, 2 deletions

diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index da98e07..ac72b02 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -53,48 +53,50 @@
 static const char * tri_xpm[]={
 "9 9 2 1",
 "a c #000000",
 ". c None",
 ".........",
 ".........",
 ".........",
 "....a....",
 "...aaa...",
 "..aaaaa..",
 ".aaaaaaa.",
 ".........",
 "........."};
 
 static const int inputWidgetStyle = QWidget::WStyle_Customize | 
             QWidget::WStyle_Tool |
             QWidget::WStyle_StaysOnTop |
             QWidget::WGroupLeader;
 
 InputMethods::InputMethods( QWidget *parent ) :
     QWidget( parent, "InputMethods", WStyle_Tool | WStyle_Customize )
 {
     method = NULL;
 
+        setBackgroundMode ( PaletteBackground );
+
     QHBoxLayout *hbox = new QHBoxLayout( this );
 
     kbdButton = new QToolButton( this );
     kbdButton->setFocusPolicy(NoFocus);
     kbdButton->setToggleButton( TRUE );
     kbdButton->setFixedHeight( 17 );
     kbdButton->setFixedWidth( 32 );
     kbdButton->setAutoRaise( TRUE );
     kbdButton->setUsesBigPixmap( TRUE );
     hbox->addWidget( kbdButton );
     connect( kbdButton, SIGNAL(toggled(bool)), this, SLOT(showKbd(bool)) );
 
     kbdChoice = new QToolButton( this );
     kbdChoice->setFocusPolicy(NoFocus);
     kbdChoice->setPixmap( QPixmap( (const char **)tri_xpm ) );
     kbdChoice->setFixedHeight( 17 );
     kbdChoice->setFixedWidth( 12 );
     kbdChoice->setAutoRaise( TRUE );
     hbox->addWidget( kbdChoice );
     connect( kbdChoice, SIGNAL(clicked()), this, SLOT(chooseKbd()) );
 
     connect( (QPEApplication*)qApp, SIGNAL(clientMoused()),
       this, SLOT(resetStates()) );
 
diff --git a/core/launcher/mrulist.cpp b/core/launcher/mrulist.cpp
index 5590d38..0530fd6 100644
--- a/core/launcher/mrulist.cpp
+++ b/core/launcher/mrulist.cpp
@@ -19,49 +19,49 @@
 **
 **********************************************************************/
 
 #include "mrulist.h"
 
 #include <qpe/global.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 
 #include <qframe.h>
 #include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qpopupmenu.h>
 #include <qpainter.h>
 #include <qwindowsystem_qws.h>
 
 
         QList<MRUList>*MRUList::MRUListWidgets = NULL;
         QList<AppLnk>*MRUList::task = NULL;
 
 
 MRUList::MRUList( QWidget *parent )
        : QFrame( parent ), selected(-1), oldsel(-1)
 {
-    setBackgroundMode( PaletteButton );
+    setBackgroundMode( PaletteBackground );
     if (!MRUListWidgets)
         MRUListWidgets = new QList<MRUList>;
     if (!task)
         task = new QList<AppLnk>;
     MRUListWidgets->append( this );
 }
 
 
 MRUList::~MRUList()
 {
     if (MRUListWidgets)
         MRUListWidgets->remove( this );
     if (task)
         task->setAutoDelete( TRUE );
 }
 
 
 QSize MRUList::sizeHint() const
 {
     return QSize( frameWidth(), 16 );
 }
 
 // thanks to John from Trolltech
 void MRUList::removeTask(const QString &appName )
@@ -182,42 +182,43 @@ void MRUList::mousePressEvent(QMouseEvent *e)
 
 
 void MRUList::mouseReleaseEvent(QMouseEvent *)
 {
     if ( selected >= 0 ) {
         if ( parentWidget() )
             if ( parentWidget()->isA( "QPopupMenu" ) )
                 parentWidget()->hide();
         Global::execute( task->at(selected)->exec() );
         selected = -1;
         oldsel = -1;
         update();
     }
 }
 
 
 void MRUList::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
     AppLnk *t;
     int x = 0;
     int y = (height() - 14) / 2;
     int i = 0;
 
-    p.fillRect( 0, 0, width(), height(), colorGroup().background() );
+//    p.fillRect( 0, 0, width(), height(), colorGroup().background() );
+        erase ( );
 
     if ( task ) {
         QListIterator<AppLnk> it( *task );
         for ( ; it.current(); i++, ++it ) {
             if ( x + 15 <= width() ) {
                 t = it.current();
                 if ( (int)i == selected )
                     p.fillRect( x, y, 15, t->pixmap().height()+1, colorGroup().highlight() );
                 else if ( (int)i == oldsel )
                     p.eraseRect( x, y, 15, t->pixmap().height()+1 );
                 p.drawPixmap( x, y, t->pixmap() );
                 x += 15;
             }
         }
     }
 }