responsive layout

cell.cpp

@@ -17,7 +17,6 @@ Cell::Cell(QWidget *parent) : QWidget(parent)
     for (char i = 0; i < 9; i++)
     {
         m_states[i] = new QPushButton(QString::number(i + 1), this);
-        m_states[i]->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::MinimumExpanding);
         layout->addWidget(m_states[i], i % 3, i / 3);
         m_states[i]->setStyleSheet("border:none");
         connect(m_states[i], SIGNAL(clicked()), mapper, SLOT(map()));
@@ -31,10 +30,16 @@ Cell::Cell(QWidget *parent) : QWidget(parent)
     m_stackedWidget = new QStackedWidget(this);
     m_stackedWidget->addWidget(groupBox);
     m_stackedWidget->addWidget(m_number);
-    m_stackedWidget->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::MinimumExpanding);
-    heightForWidth(this->width());
-    setMinimumSize(100,100);
-    //m_stackedWidget->setFixedSize(70,70);
+    setMinimumSize(70, 70);
+}
+
+void Cell::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    m_stackedWidget->setFixedSize(this->size());
+    int smallest = this->width() < this->height() ? this->width() : this->height();
+    m_number->setStyleSheet("font-size:" + QString::number(smallest / 2) + "px;");
+    return;
 }
 
 void Cell::collapse(int x)
@@ -46,10 +51,10 @@ void Cell::collapse(int x)
 }
 void Cell::removeOption(int x)
 {
-    // states[x]->hide();
-    if (m_states[x]->isEnabled())
+    if (m_blocked[x] == 0)
     {
         m_states[x]->setDisabled(true);
+        m_states[x]->setText(" ");
         possibleStates--;
         index.erase(std::find(index.begin(), index.end(), x));
     }
@@ -62,12 +67,14 @@ void Cell::addOption(int x)
     // if (!m_states[x]->isEnabled())
     if (m_blocked[x] < 1)
     {
+        m_states[x]->setText(QString::number(x + 1));
         m_states[x]->setDisabled(false);
         possibleStates++;
         index.push_back(x);
     }
 }
-void Cell::un(void){
+void Cell::un(void)
+{
     collapsed = false;
     m_stackedWidget->setCurrentIndex(0);
     emit(undo(m_number->text().toInt() - 1));

cell.h

@@ -2,14 +2,14 @@
 #define CELL_H
 
 #include <QWidget>
-#include <QStackedWidget>
-
 class QPushButton;
+class QStackedWidget;
 class Cell : public QWidget
 {
     Q_OBJECT
 public:
     explicit Cell(QWidget *parent = 0);
+    void resizeEvent(QResizeEvent *event);
     int possibleStates = 9;
     bool collapsed = false;
     std::vector<int> index = {0, 1, 2, 3, 4, 5, 6, 7, 8};

window.cpp

@@ -24,17 +24,24 @@ Window::Window(QWidget *parent)
     m_slider->setValue(m_delay);
     connect(m_slider, SIGNAL(valueChanged(int)), this, SLOT(setValue(int)));
 
-
     QHBoxLayout *horizontalLayout = new QHBoxLayout(this);
     QVBoxLayout *verticalLayout = new QVBoxLayout();
     QGridLayout *layout = new QGridLayout();
 
+    m_spacer[0] = new QSpacerItem(8, 8, QSizePolicy::Minimum, QSizePolicy::Fixed);
+    m_spacer[1] = new QSpacerItem(8, 8, QSizePolicy::Minimum, QSizePolicy::Fixed);
+    m_spacer[2] = new QSpacerItem(8, 8, QSizePolicy::Minimum, QSizePolicy::Expanding);
+    verticalLayout->addItem(m_spacer[2]);
+
     verticalLayout->addWidget(m_solveButton);
     verticalLayout->addWidget(m_slider);
     verticalLayout->addWidget(m_clearButton);
     horizontalLayout->addLayout(layout, 5);
     horizontalLayout->addLayout(verticalLayout, 1);
 
+    layout->addItem(m_spacer[0], 3, 3);
+    layout->addItem(m_spacer[1], 7, 7);
+    layout->setSpacing(0);
 
     int dx = 0;
     int dy = 0;
@@ -43,8 +50,7 @@ Window::Window(QWidget *parent)
         for (int y = 0; y < 9; y++)
         {
             m_cell[x + y * 9].setParent(this);
-            layout->addWidget(&m_cell[x+y*9],y,x);
-
+            layout->addWidget(&m_cell[x + y * 9], y + y / 3, x + x / 3);
             // connecting signals & slots
             for (int d = 0; d < 9; d++) // rows and columns
             {

window.h

@@ -6,6 +6,7 @@
 #include <QProgressBar>
 #include <QSlider>
 #include "cell.h"
+class QSpacerItem;
 class Window : public QWidget
 {
     Q_OBJECT
@@ -15,11 +16,10 @@ public:
 private:
     QPushButton *m_clearButton;
     QPushButton *m_solveButton;
-    QPushButton *grid[9][9];
-    QProgressBar *m_progressBar;
     QSlider *m_slider;
     std::array<Cell, 81> m_cell;
     int m_delay = 300;
+    QSpacerItem *m_spacer[3];
     struct History
     {
         Cell *cell;
@@ -27,7 +27,8 @@ private:
         History(Cell *c, std::vector<int> in, int choice)
         {
             cell = c;
-            for(int i=0;i<in.size();i++){
+            for (int i = 0; i < in.size(); i++)
+            {
                 if (i == choice)
                     continue;
                 index.push_back(in[i]);