-rw-r--r-- | libqtaux/ocolorbutton.cpp | 12 |
1 files changed, 10 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 @@ -58,17 +58,17 @@ OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *n 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 ( ) @@ -97,13 +97,13 @@ 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 ( ); @@ -142,6 +142,14 @@ void OColorButton::updateColor ( const QColor &c ) pix. convertFromImage ( img ); setPixmap ( pix ); emit colorSelected ( c ); } + +/** + * @internal + */ +void OColorButton::resizeEvent( QResizeEvent *ev ) { + QPushButton::resizeEvent( ev ); + updateColor(d->m_color); +} |