more updates

tierrow.cpp

@@ -1,49 +1,44 @@
 #include "tierrow.hpp"
-#include "fullsizelayout.hpp"
+// #include "fullsizelayout.hpp"
 #include "qmimedata.h"
 #include "utils.hpp"
+#include "settings.hpp"
+#include "invalididexception.hpp"
 
 #include <QHBoxLayout>
 
 TierRow::TierRow(IdType id, QWidget *parent)
-    : QWidget{parent}
+    : QWidget{parent}, _id(id)
 {
+    auto settings = Settings::get();
     setAcceptDrops(true);
-    auto fadeLayout = new FullSizeLayout();
-    fadeLayout->setSizeConstraint(QLayout::SetMinimumSize);
-    fadeLayout->setContentsMargins(0, 0, 0, 0);
-    fadeLayout->setSpacing(0);
-    bgFadeContainer = new QWidget();
-    bgFadeContainer->setStyleSheet(makeBgColorString(QColor(255,255,255,100)));
-    bgFadeContainer->setMinimumSize(0, 0);
-    fadeLayout->addWidget(bgFadeContainer);
-    this->setLayout(fadeLayout);
     auto splitLayout = new QHBoxLayout();
     splitLayout->setSizeConstraint(QLayout::SetMinimumSize);
     splitLayout->setContentsMargins(0, 0, 0, 0);
     splitLayout->setSpacing(0);
+    this->setLayout(splitLayout);
     titleCard = new TierRowTitleCard(id);
     cardContainer = new QWidget();
-    cardContainer->setMinimumSize(0, 0);
-    titleCard->setFixedSize(150, 150);
     cardContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     splitLayout->addWidget(titleCard, 0, Qt::AlignLeft | Qt::AlignTop);
     splitLayout->addWidget(cardContainer, 1, Qt::AlignTop);
 
-    cardContainer->setStyleSheet(makeBgColorString(QColor(60,60,60,100)));
-
-    bgFadeContainer->setLayout(splitLayout);
-    cardLayout = new FlowLayout();
+    // cardContainer->setStyleSheet(makeBgColorString(QColor(60,60,60,100)));
+    cardLayout = new FlowLayout(nullptr, 0, 0, 0);
     cardLayout->setSizeConstraint(QLayout::SetMinimumSize);
     cardLayout->setContentsMargins(0, 0, 0, 0);
     cardLayout->setSpacing(0);
     cardContainer->setLayout(cardLayout);
-    // setMinimumSize(0, 0);
+    connect(settings, SIGNAL(cardSizeChange(QSize)),
+            this, SLOT(cardResize(QSize)));
+    connect(settings, SIGNAL(rowFadeChange(float)),
+            this, SLOT(fadeChange(float)));
+    cardResize(settings->cardSize());
 }
 
 TierRow::~TierRow()
 {
-    qDebug() << "Row destructor called " << id();
+    // qDebug() << "Row destructor called " << id();
     if (idMap.erase(id()) == 0)
     {
         qDebug() << "Row id not found during destructor";
@@ -60,12 +55,20 @@ void TierRow::addCard(TierCard* card)
 // }
 void TierRow::setColor(QColor color)
 {
+    auto settings = Settings::get();
+    auto fade = settings->rowFade();
+    if (fade < 0)
+        fade = 0;
+    if (fade > 1)
+        fade = 1;
     _color = color;
+    const QColor wh(255,255,255);
     titleCard->setColor(color);
-    auto str = makeBgColorString(color);
+    auto fadedColor = blend(wh, color, fade);
+    auto str = makeBgColorString(fadedColor);
     setStyleSheet(str);
 }
-QColor TierRow::color()
+QColor TierRow::color() const
 {
     return _color;
 }
@@ -73,13 +76,13 @@ void TierRow::setText(QString text)
 {
     titleCard->setText(text);
 }
-QString TierRow::text()
+QString TierRow::text() const
 {
     return titleCard->text();
 }
-uint32_t TierRow::id()
+uint32_t TierRow::id() const
 {
-    return titleCard->id();
+    return _id;
 }
 
 void TierRow::resizeEvent(QResizeEvent* event)
@@ -90,7 +93,8 @@ void TierRow::resizeEvent(QResizeEvent* event)
 
 void TierRow::recalcMaxHeight()
 {
-    setMaximumHeight(cardLayout->totalMinimumHeightForWidth(cardContainer->width()));
+    setMaximumHeight(cardLayout->totalMinimumHeightForWidth(
+        cardContainer->width()));
 }
 
 TierRow* TierRow::create(QWidget* parent)
@@ -117,21 +121,25 @@ TierRow* TierRow::getFromId(IdType id)
     return iter->second;
 }
 
-void TierRow::dropEvent(QDropEvent *event)
+void TierRow::dropEvent(QDropEvent* event)
 {
     qDebug() << "drop event";
+    // auto source = event->source();
     //card dragged to this row
     if (event->mimeData()->hasFormat(TierCard::MimeType))
     {
         if (event->proposedAction() == Qt::MoveAction)
         {
+            clearPlaceholder();
             auto data = event->mimeData()->data(TierCard::MimeType);
             QDataStream stream(&data, QIODevice::ReadOnly);
             TierCard::IdType cardId;
-            uint dataLen = 0;
-            stream.readRawData(reinterpret_cast<char*>(&cardId), dataLen);
+            stream.readRawData(reinterpret_cast<char*>(&cardId), sizeof(cardId));
             auto card = TierCard::getFromId(cardId);
-            addCard(card);
+            if (!card)
+                throw InvalidCardIdException(cardId);
+            // addCard(card);
+            cardLayout->setIndex(card, calculateIndex(event->position()));
             event->acceptProposedAction();
         }
         else
@@ -146,13 +154,24 @@ void TierRow::dropEvent(QDropEvent *event)
     }
 }
 
-void TierRow::dragEnterEvent(QDragEnterEvent *event)
+void TierRow::dragEnterEvent(QDragEnterEvent* event)
 {
     qDebug() << "drag enter event";
+    if (cardCount() == 0)
+    {
+        qDebug() << "enter empty";
+    }
     if (event->mimeData()->hasFormat(TierCard::MimeType))
     {
         if (event->proposedAction() == Qt::MoveAction)
         {
+            if (placeholder != nullptr)
+            {
+                qDebug() << "placeholder not previously cleared";
+                clearPlaceholder();
+            }
+            placeholder = new TierPlaceholder();
+            cardLayout->setIndex(placeholder, calculateIndex(event->position()));
             event->setDropAction(Qt::MoveAction);
             event->accept(cardContainer->rect());
         }
@@ -172,13 +191,18 @@ void TierRow::dragEnterEvent(QDragEnterEvent *event)
     }
 }
 
-void TierRow::dragMoveEvent(QDragMoveEvent *event)
+void TierRow::dragMoveEvent(QDragMoveEvent* event)
 {
-    qDebug() << "drag move event";
     if (event->mimeData()->hasFormat(TierCard::MimeType))
     {
         if (event->proposedAction() == Qt::MoveAction)
         {
+            if (cardCount() == 1)
+            {
+                qDebug() << "moving in empty";
+            }
+            if (placeholder)
+                cardLayout->setIndex(placeholder, calculateIndex(event->position()));
             event->acceptProposedAction();
         }
         else
@@ -190,9 +214,62 @@ void TierRow::dragMoveEvent(QDragMoveEvent *event)
     else if (event->mimeData()->hasImage())
     {
         event->setDropAction(Qt::CopyAction);
-        event->accept();
+        //TODO event->accept();
+        event->ignore();
     }
-    else {
+    else
+    {
         event->ignore();
     }
 }
+
+void TierRow::dragLeaveEvent(QDragLeaveEvent* event)
+{
+    clearPlaceholder();
+}
+
+void TierRow::clearPlaceholder()
+{
+    placeholder->setParent(nullptr);
+    placeholder->deleteLater();
+    placeholder = nullptr;
+}
+
+int TierRow::calculateIndex(QPointF loc)
+{
+    auto settings = Settings::get();
+    auto cardSize = settings->cardSize();
+    auto cardCenter = loc + QPointF(cardSize.width() / 2,
+                                    cardSize.height() / 2);
+    auto lastBefore = 0;
+    for (int i = 0; i < cardLayout->count(); i++)
+    {
+        auto refCard = cardLayout->itemAt(i);
+        auto refPos = refCard->widget()->pos();
+        if (cardCenter.y() > refPos.y()
+            && cardCenter.x() > refPos.x())
+            lastBefore = i;
+        else
+            break;
+    }
+    return lastBefore;
+}
+
+void TierRow::cardResize(QSize newSize)
+{
+    titleCard->setFixedSize(newSize);
+    cardContainer->setMinimumHeight(newSize.height());
+    cardContainer->updateGeometry();
+    updateGeometry();
+    Settings::get()->mainWindow()->updateGeometry();
+}
+
+void TierRow::fadeChange(float newFade)
+{
+    setColor(_color);
+}
+
+int TierRow::cardCount() const
+{
+    return cardLayout->count();
+}