summaryrefslogtreecommitdiff
path: root/libopie/ocolorbutton.cpp
authordrw <drw>2002-12-05 17:13:45 (UTC)
committer drw <drw>2002-12-05 17:13:45 (UTC)
commit675ab68194cc25793a18fd9e495958a90aaf0173 (patch) (side-by-side diff)
treee2599a7dbef3184f015593f0b7ffe533c45a5ba5 /libopie/ocolorbutton.cpp
parent1eb333726ccf7c608b9f987aac1a04d37d35936c (diff)
downloadopie-675ab68194cc25793a18fd9e495958a90aaf0173.zip
opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.gz
opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.bz2
Modified OColorButton to pass color to color dialog. Impacts appearance, launcher settings and liquid settings.
Diffstat (limited to 'libopie/ocolorbutton.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/ocolorbutton.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp
index 4734c0c..ddb6c4f 100644
--- a/libopie/ocolorbutton.cpp
+++ b/libopie/ocolorbutton.cpp
@@ -31,30 +31,30 @@
#include <qcolor.h>
#include <qpixmap.h>
#include <qimage.h>
-
-#include <qpe/resource.h>
-
+
+#include <qpe/resource.h>
+
class OColorButtonPrivate {
public:
QPopupMenu *m_menu;
QColor m_color;
};
-OColorButton::OColorButton ( QWidget *parent, const char *name )
+OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name )
: QPushButton ( parent, name )
{
d = new OColorButtonPrivate;
-
- d-> m_menu = new ColorPopupMenu ( black, 0, 0 );
+
+ d-> m_menu = new ColorPopupMenu ( color, 0, 0 );
setPopup ( d-> m_menu );
// setPopupDelay ( 0 );
connect ( d-> m_menu, SIGNAL( colorSelected ( const QColor & )), this, SLOT( updateColor ( const QColor & )));
-
- updateColor ( black );
-
+
+ updateColor ( color );
+
QSize s = sizeHint ( ) + QSize ( 12, 0 );
setMinimumSize ( s );
- setMaximumSize ( s. width ( ) * 2, s. height ( ));
+ setMaximumSize ( s. width ( ) * 2, s. height ( ));
}
OColorButton::~OColorButton ( )