author | zecke <zecke> | 2004-09-12 16:07:13 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-12 16:07:13 (UTC) |
commit | 36a4f75e1f4e5a3858749779ea26a3fe3154d1f0 (patch) (side-by-side diff) | |
tree | 18a61aedb81a9823cbf212cc82662c66101133f7 | |
parent | 12730b959f92a9d601d81bf28ab87fb265effe55 (diff) | |
download | opie-36a4f75e1f4e5a3858749779ea26a3fe3154d1f0.zip opie-36a4f75e1f4e5a3858749779ea26a3fe3154d1f0.tar.gz opie-36a4f75e1f4e5a3858749779ea26a3fe3154d1f0.tar.bz2 |
Do not limit the Image to 16x16 but use width() and height()
+ magic numbers to make the Image fit the button
-rw-r--r-- | libqtaux/ocolorbutton.cpp | 12 | ||||
-rw-r--r-- | libqtaux/ocolorbutton.h | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/libqtaux/ocolorbutton.cpp b/libqtaux/ocolorbutton.cpp index 9e41d93..925df7f 100644 --- a/libqtaux/ocolorbutton.cpp +++ b/libqtaux/ocolorbutton.cpp @@ -56,21 +56,21 @@ OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *n { d = new OColorButtonPrivate; d-> m_menu = new OColorPopupMenu ( color, 0, 0 ); setPopup ( d-> m_menu ); // setPopupDelay ( 0 ); connect ( d-> m_menu, SIGNAL( colorSelected(const QColor&)), this, SLOT( updateColor(const QColor&))); - updateColor ( color ); QSize s = sizeHint ( ) + QSize ( 12, 0 ); setMinimumSize ( s ); setMaximumSize ( s. width ( ) * 2, s. height ( )); + d->m_color = color; } /** * This destructs the object */ OColorButton::~OColorButton ( ) { delete d; @@ -95,17 +95,17 @@ void OColorButton::setColor ( const QColor &c ) /** * @internal */ void OColorButton::updateColor ( const QColor &c ) { d-> m_color = c; - QImage img ( 16, 16, 32 ); + QImage img ( width()-14, height()-6, 32 ); img. fill ( 0 ); int r, g, b; c. rgb ( &r, &g, &b ); int w = img. width ( ); int h = img. height ( ); @@ -140,8 +140,16 @@ void OColorButton::updateColor ( const QColor &c ) QPixmap pix; pix. convertFromImage ( img ); setPixmap ( pix ); emit colorSelected ( c ); } + +/** + * @internal + */ +void OColorButton::resizeEvent( QResizeEvent *ev ) { + QPushButton::resizeEvent( ev ); + updateColor(d->m_color); +} diff --git a/libqtaux/ocolorbutton.h b/libqtaux/ocolorbutton.h index ca68f1f..10b77d5 100644 --- a/libqtaux/ocolorbutton.h +++ b/libqtaux/ocolorbutton.h @@ -50,16 +50,19 @@ class OColorButton : public QPushButton { Q_OBJECT public: OColorButton ( QWidget *parent = 0, const QColor & = black, const char *name = 0 ); virtual ~OColorButton ( ); QColor color ( ) const; +protected: + void resizeEvent( QResizeEvent* ); + signals: /** * emitted when a color gets selected */ void colorSelected ( const QColor & ); public slots: virtual void setColor ( const QColor & ); |