summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libqtaux/ocolorbutton.cpp12
-rw-r--r--libqtaux/ocolorbutton.h3
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
@@ -52,29 +52,29 @@ struct OColorButtonPrivate
* @param name @see QObject
*/
OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name )
: QPushButton ( parent, name )
{
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;
}
/**
* @return Returns the current color of the button
@@ -91,25 +91,25 @@ QColor OColorButton::color ( ) const
void OColorButton::setColor ( const QColor &c )
{
updateColor ( 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 ( );
int dx = w * 20 / 100; // 15%
int dy = h * 20 / 100;
for ( int y = 0; y < h; y++ )
@@ -136,12 +136,20 @@ void OColorButton::updateColor ( const QColor &c )
img. setPixel ( x, y, qRgba ( r, g, b, a ));
}
}
img. setAlphaBuffer ( true );
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
@@ -45,24 +45,27 @@ namespace Opie
* @author Robert Griebl ( sandman@handhelds.org )
* @version 1.0
* @see QPushButton
*/
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 & );
protected slots:
/**