author | simon <simon> | 2002-12-09 14:29:48 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 14:29:48 (UTC) |
commit | 3f88070b9be5209cdd88caa0afd7f7294d3b1764 (patch) (side-by-side diff) | |
tree | fe1c3c224e6d6930cef0756f4e23aded980d692f /noncore/multimedia/opieplayer2/mediawidget.h | |
parent | 8746877e7ed89fc4c227d5d79d63c35c69ceacd6 (diff) | |
download | opie-3f88070b9be5209cdd88caa0afd7f7294d3b1764.zip opie-3f88070b9be5209cdd88caa0afd7f7294d3b1764.tar.gz opie-3f88070b9be5209cdd88caa0afd7f7294d3b1764.tar.bz2 |
- merged the separate mask and pixmap arrays into the Button structure
and the buttons vector
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediawidget.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 2641df6..504b705 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h @@ -21,12 +21,13 @@ */ #ifndef MEDIAWIDGET_H #define MEDIAWIDGET_H #include <qwidget.h> +#include <qmap.h> #include "mediaplayerstate.h" #include "playlistwidget.h" #include <vector> @@ -41,12 +42,16 @@ public: { Button() : type( NormalButton ), isHeld( false ), isDown( false ) {} ButtonType type : 1; bool isHeld : 1; bool isDown : 1; + + QBitmap mask; + QPixmap pixUp; + QPixmap pixDown; }; typedef std::vector<Button> ButtonVector; struct SkinButtonInfo { Command command; @@ -87,16 +92,12 @@ protected: PlayListWidget &playList; ButtonVector buttons; QImage buttonMask; - MaskVector masks; - PixmapVector buttonPixUp; - PixmapVector buttonPixDown; - QPoint upperLeftOfButtonMask; }; #endif // MEDIAWIDGET_H /* vim: et sw=4 ts=4 */ |