summaryrefslogtreecommitdiff
path: root/noncore/graphics/drawpad/colorpanel.cpp
Side-by-side diff
Diffstat (limited to 'noncore/graphics/drawpad/colorpanel.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/graphics/drawpad/colorpanel.cpp18
1 files changed, 2 insertions, 16 deletions
diff --git a/noncore/graphics/drawpad/colorpanel.cpp b/noncore/graphics/drawpad/colorpanel.cpp
index 1db0d7b..9327012 100644
--- a/noncore/graphics/drawpad/colorpanel.cpp
+++ b/noncore/graphics/drawpad/colorpanel.cpp
@@ -19,47 +19,32 @@
ColorPanelButton::ColorPanelButton(const QColor& color, QWidget* parent, const char* name)
: QFrame(parent, name)
{
m_color = color;
setFixedSize(16, 16);
- setActive(false);
+ setFrameStyle(NoFrame);
}
ColorPanelButton::~ColorPanelButton()
{
}
-void ColorPanelButton::setActive(bool active)
-{
- m_active = active;
-
- if (m_active) {
- setFrameStyle(Panel | Sunken);
- } else {
- setFrameStyle(NoFrame);
- }
-}
-
void ColorPanelButton::enterEvent(QEvent* e)
{
Q_UNUSED(e)
- if (!m_active) {
setFrameStyle(Panel | Sunken);
}
-}
void ColorPanelButton::leaveEvent(QEvent* e)
{
Q_UNUSED(e)
- if (!m_active) {
setFrameStyle(NoFrame);
}
-}
void ColorPanelButton::paintEvent(QPaintEvent* e)
{
QFrame::paintEvent(e);
QPainter painter;
@@ -122,12 +107,13 @@ ColorPanel::~ColorPanel()
}
void ColorPanel::addColor(const QColor& color, int row, int col)
{
ColorPanelButton* panelButton = new ColorPanelButton(color, this);
connect(panelButton, SIGNAL(selected(const QColor&)), this, SLOT(buttonSelected(const QColor&)));
+
m_pGridLayout->addWidget(panelButton, row, col);
}
void ColorPanel::buttonSelected(const QColor& color)
{
emit colorSelected(color);