-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 3a44185..b73a5c0 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -95,12 +95,12 @@ bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const | |||
95 | position.y() < buttonMask.height() && | 95 | position.y() < buttonMask.height() && |
96 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); | 96 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); |
97 | } | 97 | } |
98 | 98 | ||
99 | void MediaWidget::paintButton( int buttonId ) | 99 | void MediaWidget::paintButton( const Button &button ) |
100 | { | 100 | { |
101 | QPainter p( this ); | 101 | QPainter p( this ); |
102 | paintButton( p, buttons[ buttonId ] ); | 102 | paintButton( p, button ); |
103 | } | 103 | } |
104 | 104 | ||
105 | void MediaWidget::paintButton( QPainter &p, const Button &button ) | 105 | void MediaWidget::paintButton( QPainter &p, const Button &button ) |
106 | { | 106 | { |
@@ -111,10 +111,13 @@ void MediaWidget::paintButton( QPainter &p, const Button &button ) | |||
111 | } | 111 | } |
112 | 112 | ||
113 | void MediaWidget::toggleButton( int buttonId ) | 113 | void MediaWidget::toggleButton( int buttonId ) |
114 | { | 114 | { |
115 | buttons[ buttonId ].isDown = !buttons[ buttonId ].isDown; | 115 | Button &button = buttons[ buttonId ]; |
116 | paintButton( buttonId ); | 116 | |
117 | button.isDown = !button.isDown; | ||
118 | |||
119 | paintButton( button ); | ||
117 | } | 120 | } |
118 | 121 | ||
119 | /* vim: et sw=4 ts=4 | 122 | /* vim: et sw=4 ts=4 |
120 | */ | 123 | */ |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 8cdaad1..dcf7fb8 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -86,9 +86,9 @@ protected: | |||
86 | void handleCommand( Command command, bool buttonDown ); | 86 | void handleCommand( Command command, bool buttonDown ); |
87 | 87 | ||
88 | bool isOverButton( const QPoint &position, int buttonId ) const; | 88 | bool isOverButton( const QPoint &position, int buttonId ) const; |
89 | 89 | ||
90 | void paintButton( int buttonId ); | 90 | void paintButton( const Button &button ); |
91 | void paintButton( QPainter &p, const Button &button ); | 91 | void paintButton( QPainter &p, const Button &button ); |
92 | 92 | ||
93 | void toggleButton( int buttonId ); | 93 | void toggleButton( int buttonId ); |
94 | 94 | ||