Diffstat (limited to 'noncore/graphics/drawpad/colorpanel.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/colorpanel.cpp | 22 |
1 files changed, 4 insertions, 18 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 @@ -21,42 +21,27 @@ ColorPanelButton::ColorPanelButton(const QColor& color, QWidget* parent, const c { 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); - } + setFrameStyle(Panel | Sunken); } void ColorPanelButton::leaveEvent(QEvent* e) { Q_UNUSED(e) - if (!m_active) { - setFrameStyle(NoFrame); - } + setFrameStyle(NoFrame); } void ColorPanelButton::paintEvent(QPaintEvent* e) { @@ -124,8 +109,9 @@ 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) |