X-Git-Url: http://git.maemo.org/git/?p=colorflood;a=blobdiff_plain;f=colorflood%2Fsrc%2Fcolorbuttons.cpp;h=e86da051b2a8af8fcfe0de55feedf71ed956d283;hp=d8275f6b6f341688d9de9a4271b67b3491dcda8c;hb=HEAD;hpb=cbb9a378984c50baddc9997240fa67a186b954ae

diff --git a/colorflood/src/colorbuttons.cpp b/colorflood/src/colorbuttons.cpp
index d8275f6..e86da05 100644
--- a/colorflood/src/colorbuttons.cpp
+++ b/colorflood/src/colorbuttons.cpp
@@ -15,9 +15,10 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QPushButton>
-#include <QVBoxLayout>
+#include <QGridLayout>
 #include "colorbuttons.hpp"
 #include "colorscheme.hpp"
+#include "colorbutton.hpp"
 
 ColorButtons::ColorButtons (QWidget *parent)
     : QGroupBox(parent)
@@ -25,19 +26,12 @@ ColorButtons::ColorButtons (QWidget *parent)
     Q_ASSERT(parent);
 
     const QVector<QBrush> &scheme = ColorScheme::instance().getScheme();
-    QVBoxLayout *layout = new QVBoxLayout;
+    QGridLayout *layout = new QGridLayout;
 
     for (int i = 0; i < scheme.size(); i++)
     {
-        QPixmap pixmap(64, 64);
-        QPainter painter;
-        painter.begin(&pixmap);
-        painter.fillRect(pixmap.rect(), scheme.at(i));
-        painter.end();
-
-        QPushButton *button = new QPushButton(pixmap, "", this);
-        button->setFixedSize(48, 48);
-        layout->addWidget(button);
+        ColorButton *button = new ColorButton(this, i);
+        layout->addWidget(button, (i - (i % 3)) / 3, i % 3);
         group.addButton(button, i);
     }
 
@@ -46,5 +40,6 @@ ColorButtons::ColorButtons (QWidget *parent)
                      this,
                      SIGNAL(flood(int)));
 
+    layout->setSpacing(24);
     setLayout(layout);
 }