Improve ColorButton to render properly, adhering to QStyle

Closes #105 (unless it still fails on Mac, then please reopen)

diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp
index 4a833d0..5d5d091 100644 (file)
--- a/src/uisupport/colorbutton.cpp
+++ b/src/uisupport/colorbutton.cpp
@@ -21,16 +21,10 @@
 #include "colorbutton.h"
 
 #include <QPainter>
-#include <QDebug>
-#include <QPaintEvent>
-#include <QApplication>
 #include <QStyle>
 #include <QStyleOptionFrame>
 
-ColorButton::ColorButton(QWidget *parent) :
-    QPushButton(parent),
-    _color(QColor()) //default is white; 
-    {
+ColorButton::ColorButton(QWidget *parent) : QPushButton(parent) {
 
 }
 
@@ -43,26 +37,33 @@ QColor ColorButton::color() const {
   return _color;
 }
 
-void ColorButton::paintEvent(QPaintEvent *event) {
-  //TODO: work on a good button style solution
-  QPushButton::paintEvent(event);
+/* This has been heavily inspired by KDE's KColorButton, thanks! */
+void ColorButton::paintEvent(QPaintEvent *) {
   QPainter painter(this);
-  int border = QApplication::style()->pixelMetric(QStyle::PM_ButtonMargin);
 
-  // if twice buttonMargin (+2 px from the adjust) is greater than the button height
-  // then set the border to a third of the button height.
-  if(2*border+2 >= event->rect().height()) border = event->rect().height()/3;
+  QStyleOptionButton opt;
+  initStyleOption(&opt);
+  opt.state |= isDown() ? QStyle::State_Sunken : QStyle::State_Raised;
+  opt.features = QStyleOptionButton::None;
+  if(isDefault())
+    opt.features |= QStyleOptionButton::DefaultButton;
 
-  QBrush brush;
-  if(isEnabled()) {
-    brush = QBrush(_color);
-  } else {
-    brush = QBrush(_color, Qt::Dense4Pattern);
+  // Draw bevel
+  style()->drawControl(QStyle::CE_PushButtonBevel, &opt, &painter, this);
+
+  // Calc geometry
+  QRect labelRect = style()->subElementRect(QStyle::SE_PushButtonContents, &opt, this);
+  int shift = style()->pixelMetric(QStyle::PM_ButtonMargin);
+  labelRect.adjust(shift, shift, -shift, -shift);
+  int x, y, w, h;
+  labelRect.getRect(&x, &y, &w, &h);
+
+  if(isChecked() || isDown()) {
+    x += style()->pixelMetric(QStyle::PM_ButtonShiftHorizontal);
+    y += style()->pixelMetric(QStyle::PM_ButtonShiftVertical);
   }
-  painter.fillRect(rect().adjusted(border+1, border+1, -border-1, -border-1), brush);
-  QStyleOptionFrame option;
-  option.state = QStyle::State_Sunken;
-  option.rect = rect().adjusted(border, border, -border, -border);
 
-  QApplication::style()->drawPrimitive(QStyle::PE_Frame, &option, &painter);
+  // Draw color rect
+  QBrush brush = isEnabled() ? color() : palette().color(backgroundRole());
+  qDrawShadePanel(&painter, x, y, w, h, palette(), true, 1, &brush);
 }

diff --git a/src/uisupport/colorbutton.h b/src/uisupport/colorbutton.h
index 8375858..37e830d 100644 (file)
--- a/src/uisupport/colorbutton.h
+++ b/src/uisupport/colorbutton.h
@@ -18,16 +18,19 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _COLORBUTTON_H_
-#define _COLORBUTTON_H_
+#ifndef COLORBUTTON_H_
+#define COLORBUTTON_H_
 
 #include <QPushButton>
 
 class ColorButton : public QPushButton {
   Q_OBJECT
+  Q_PROPERTY(QColor color READ color WRITE setColor USER true)
 
   public:
-    ColorButton(QWidget *parent = 0);
+    explicit ColorButton(QWidget *parent = 0);
+    explicit ColorButton(const QColor &c, QWidget *parent = 0);
+
     void setColor(const QColor &color);
     QColor color() const;