author | simon <simon> | 2002-12-09 14:29:48 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 14:29:48 (UTC) |
commit | 3f88070b9be5209cdd88caa0afd7f7294d3b1764 (patch) (unidiff) | |
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 | |||
@@ -24,6 +24,7 @@ | |||
24 | #define MEDIAWIDGET_H | 24 | #define MEDIAWIDGET_H |
25 | 25 | ||
26 | #include <qwidget.h> | 26 | #include <qwidget.h> |
27 | #include <qmap.h> | ||
27 | 28 | ||
28 | #include "mediaplayerstate.h" | 29 | #include "mediaplayerstate.h" |
29 | #include "playlistwidget.h" | 30 | #include "playlistwidget.h" |
@@ -44,6 +45,10 @@ public: | |||
44 | ButtonType type : 1; | 45 | ButtonType type : 1; |
45 | bool isHeld : 1; | 46 | bool isHeld : 1; |
46 | bool isDown : 1; | 47 | bool isDown : 1; |
48 | |||
49 | QBitmap mask; | ||
50 | QPixmap pixUp; | ||
51 | QPixmap pixDown; | ||
47 | }; | 52 | }; |
48 | typedef std::vector<Button> ButtonVector; | 53 | typedef std::vector<Button> ButtonVector; |
49 | 54 | ||
@@ -90,10 +95,6 @@ protected: | |||
90 | 95 | ||
91 | QImage buttonMask; | 96 | QImage buttonMask; |
92 | 97 | ||
93 | MaskVector masks; | ||
94 | PixmapVector buttonPixUp; | ||
95 | PixmapVector buttonPixDown; | ||
96 | |||
97 | QPoint upperLeftOfButtonMask; | 98 | QPoint upperLeftOfButtonMask; |
98 | }; | 99 | }; |
99 | 100 | ||