| -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 @@ -60,13 +60,13 @@ OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *n 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 @@ -99,9 +99,9 @@ void OColorButton::setColor ( const QColor &c ) 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 ); @@ -144,4 +144,12 @@ void OColorButton::updateColor ( const QColor &c ) 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 @@ -53,8 +53,11 @@ 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 |