-rw-r--r-- | core/launcher/inputmethods.cpp | 2 | ||||
-rw-r--r-- | core/launcher/mrulist.cpp | 5 |
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 | |||
@@ -65,24 +65,26 @@ static const char * tri_xpm[]={ | |||
65 | "........."}; | 65 | "........."}; |
66 | 66 | ||
67 | static const int inputWidgetStyle = QWidget::WStyle_Customize | | 67 | static const int inputWidgetStyle = QWidget::WStyle_Customize | |
68 | QWidget::WStyle_Tool | | 68 | QWidget::WStyle_Tool | |
69 | QWidget::WStyle_StaysOnTop | | 69 | QWidget::WStyle_StaysOnTop | |
70 | QWidget::WGroupLeader; | 70 | QWidget::WGroupLeader; |
71 | 71 | ||
72 | InputMethods::InputMethods( QWidget *parent ) : | 72 | InputMethods::InputMethods( QWidget *parent ) : |
73 | QWidget( parent, "InputMethods", WStyle_Tool | WStyle_Customize ) | 73 | QWidget( parent, "InputMethods", WStyle_Tool | WStyle_Customize ) |
74 | { | 74 | { |
75 | method = NULL; | 75 | method = NULL; |
76 | 76 | ||
77 | setBackgroundMode ( PaletteBackground ); | ||
78 | |||
77 | QHBoxLayout *hbox = new QHBoxLayout( this ); | 79 | QHBoxLayout *hbox = new QHBoxLayout( this ); |
78 | 80 | ||
79 | kbdButton = new QToolButton( this ); | 81 | kbdButton = new QToolButton( this ); |
80 | kbdButton->setFocusPolicy(NoFocus); | 82 | kbdButton->setFocusPolicy(NoFocus); |
81 | kbdButton->setToggleButton( TRUE ); | 83 | kbdButton->setToggleButton( TRUE ); |
82 | kbdButton->setFixedHeight( 17 ); | 84 | kbdButton->setFixedHeight( 17 ); |
83 | kbdButton->setFixedWidth( 32 ); | 85 | kbdButton->setFixedWidth( 32 ); |
84 | kbdButton->setAutoRaise( TRUE ); | 86 | kbdButton->setAutoRaise( TRUE ); |
85 | kbdButton->setUsesBigPixmap( TRUE ); | 87 | kbdButton->setUsesBigPixmap( TRUE ); |
86 | hbox->addWidget( kbdButton ); | 88 | hbox->addWidget( kbdButton ); |
87 | connect( kbdButton, SIGNAL(toggled(bool)), this, SLOT(showKbd(bool)) ); | 89 | connect( kbdButton, SIGNAL(toggled(bool)), this, SLOT(showKbd(bool)) ); |
88 | 90 | ||
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 | |||
@@ -31,25 +31,25 @@ | |||
31 | #include <qpopupmenu.h> | 31 | #include <qpopupmenu.h> |
32 | #include <qpainter.h> | 32 | #include <qpainter.h> |
33 | #include <qwindowsystem_qws.h> | 33 | #include <qwindowsystem_qws.h> |
34 | 34 | ||
35 | 35 | ||
36 | QList<MRUList>*MRUList::MRUListWidgets = NULL; | 36 | QList<MRUList>*MRUList::MRUListWidgets = NULL; |
37 | QList<AppLnk>*MRUList::task = NULL; | 37 | QList<AppLnk>*MRUList::task = NULL; |
38 | 38 | ||
39 | 39 | ||
40 | MRUList::MRUList( QWidget *parent ) | 40 | MRUList::MRUList( QWidget *parent ) |
41 | : QFrame( parent ), selected(-1), oldsel(-1) | 41 | : QFrame( parent ), selected(-1), oldsel(-1) |
42 | { | 42 | { |
43 | setBackgroundMode( PaletteButton ); | 43 | setBackgroundMode( PaletteBackground ); |
44 | if (!MRUListWidgets) | 44 | if (!MRUListWidgets) |
45 | MRUListWidgets = new QList<MRUList>; | 45 | MRUListWidgets = new QList<MRUList>; |
46 | if (!task) | 46 | if (!task) |
47 | task = new QList<AppLnk>; | 47 | task = new QList<AppLnk>; |
48 | MRUListWidgets->append( this ); | 48 | MRUListWidgets->append( this ); |
49 | } | 49 | } |
50 | 50 | ||
51 | 51 | ||
52 | MRUList::~MRUList() | 52 | MRUList::~MRUList() |
53 | { | 53 | { |
54 | if (MRUListWidgets) | 54 | if (MRUListWidgets) |
55 | MRUListWidgets->remove( this ); | 55 | MRUListWidgets->remove( this ); |
@@ -194,25 +194,26 @@ void MRUList::mouseReleaseEvent(QMouseEvent *) | |||
194 | } | 194 | } |
195 | } | 195 | } |
196 | 196 | ||
197 | 197 | ||
198 | void MRUList::paintEvent( QPaintEvent * ) | 198 | void MRUList::paintEvent( QPaintEvent * ) |
199 | { | 199 | { |
200 | QPainter p( this ); | 200 | QPainter p( this ); |
201 | AppLnk *t; | 201 | AppLnk *t; |
202 | int x = 0; | 202 | int x = 0; |
203 | int y = (height() - 14) / 2; | 203 | int y = (height() - 14) / 2; |
204 | int i = 0; | 204 | int i = 0; |
205 | 205 | ||
206 | p.fillRect( 0, 0, width(), height(), colorGroup().background() ); | 206 | // p.fillRect( 0, 0, width(), height(), colorGroup().background() ); |
207 | erase ( ); | ||
207 | 208 | ||
208 | if ( task ) { | 209 | if ( task ) { |
209 | QListIterator<AppLnk> it( *task ); | 210 | QListIterator<AppLnk> it( *task ); |
210 | for ( ; it.current(); i++, ++it ) { | 211 | for ( ; it.current(); i++, ++it ) { |
211 | if ( x + 15 <= width() ) { | 212 | if ( x + 15 <= width() ) { |
212 | t = it.current(); | 213 | t = it.current(); |
213 | if ( (int)i == selected ) | 214 | if ( (int)i == selected ) |
214 | p.fillRect( x, y, 15, t->pixmap().height()+1, colorGroup().highlight() ); | 215 | p.fillRect( x, y, 15, t->pixmap().height()+1, colorGroup().highlight() ); |
215 | else if ( (int)i == oldsel ) | 216 | else if ( (int)i == oldsel ) |
216 | p.eraseRect( x, y, 15, t->pixmap().height()+1 ); | 217 | p.eraseRect( x, y, 15, t->pixmap().height()+1 ); |
217 | p.drawPixmap( x, y, t->pixmap() ); | 218 | p.drawPixmap( x, y, t->pixmap() ); |
218 | x += 15; | 219 | x += 15; |