* Fix for #4284 -> The menus have the update menu thing emitted when they get triggered. | -> works surprising well https://youtu.be/KOOmhxvHA2c is a demo on a 10000ish card deck * changed my comment to make sense * fix to the issues that @ebbit1q found what caued them idk * Revert "fix to the issues that @ebbit1q found" This reverts commit 20b1ad9f7a675fd3b0d1be7452f71160ce06de71. * actual fix for the issues @ebbit1q found * its dirty but works * fix cards in zoneviews not having a menu * deleted isempty check as it is updated after the check * key binds should work now -> menus updated on zone change/attach/retranslate UI if selected * clangify * remove updateCardMenu from carditem entirely updateCardMenu is done by the player and having it in carditem led to it often being run multiple times, I've opted to instead run it in the player and remove the signal entirely the new logic updates the cardMenu every time a card is set as the activeCard in the game tab additionally a cardmenu can change while selected if the selected card: moves zone, is flipped, or is attached (it receives the unattach action) this is done in the player instead now, checking if the card is the activeCard this however exposes a flaw in the selection management where if you unselect a card the activeCard is set to nullptr, this was an existing bug and causes the action on selected cards to suddenly disappear, even if there are other cards selected! * revert null test of aCardMenu Co-authored-by: ebbit1q <ebbit1q@gmail.com>
255 lines
8 KiB
C++
255 lines
8 KiB
C++
#include "zoneviewzone.h"
|
|
|
|
#include "carddatabase.h"
|
|
#include "carddragitem.h"
|
|
#include "carditem.h"
|
|
#include "pb/command_dump_zone.pb.h"
|
|
#include "pb/command_move_card.pb.h"
|
|
#include "pb/response_dump_zone.pb.h"
|
|
#include "pb/serverinfo_card.pb.h"
|
|
#include "pending_command.h"
|
|
#include "player.h"
|
|
|
|
#include <QBrush>
|
|
#include <QDebug>
|
|
#include <QGraphicsSceneWheelEvent>
|
|
#include <QPainter>
|
|
#include <math.h>
|
|
|
|
ZoneViewZone::ZoneViewZone(Player *_p,
|
|
CardZone *_origZone,
|
|
int _numberCards,
|
|
bool _revealZone,
|
|
bool _writeableRevealZone,
|
|
QGraphicsItem *parent)
|
|
: SelectZone(_p, _origZone->getName(), false, false, true, parent, true), bRect(QRectF()), minRows(0),
|
|
numberCards(_numberCards), origZone(_origZone), revealZone(_revealZone),
|
|
writeableRevealZone(_writeableRevealZone), sortByName(false), sortByType(false)
|
|
{
|
|
if (!(revealZone && !writeableRevealZone)) {
|
|
origZone->getViews().append(this);
|
|
}
|
|
}
|
|
|
|
ZoneViewZone::~ZoneViewZone()
|
|
{
|
|
emit beingDeleted();
|
|
qDebug("ZoneViewZone destructor");
|
|
if (!(revealZone && !writeableRevealZone)) {
|
|
origZone->getViews().removeOne(this);
|
|
}
|
|
}
|
|
|
|
QRectF ZoneViewZone::boundingRect() const
|
|
{
|
|
return bRect;
|
|
}
|
|
|
|
void ZoneViewZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
|
|
{
|
|
QBrush windowBrush(QColor(240, 240, 240));
|
|
windowBrush.setColor(windowBrush.color().darker(150));
|
|
painter->fillRect(boundingRect(), windowBrush);
|
|
}
|
|
|
|
void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardList)
|
|
{
|
|
if (!cardList.isEmpty()) {
|
|
for (int i = 0; i < cardList.size(); ++i)
|
|
addCard(
|
|
new CardItem(player, QString::fromStdString(cardList[i]->name()), cardList[i]->id(), revealZone, this),
|
|
false, i);
|
|
reorganizeCards();
|
|
} else if (!origZone->contentsKnown()) {
|
|
Command_DumpZone cmd;
|
|
cmd.set_player_id(player->getId());
|
|
cmd.set_zone_name(name.toStdString());
|
|
cmd.set_number_cards(numberCards);
|
|
|
|
PendingCommand *pend = player->prepareGameCommand(cmd);
|
|
connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this,
|
|
SLOT(zoneDumpReceived(const Response &)));
|
|
player->sendGameCommand(pend);
|
|
} else {
|
|
const CardList &c = origZone->getCards();
|
|
int number = numberCards == -1 ? c.size() : (numberCards < c.size() ? numberCards : c.size());
|
|
for (int i = 0; i < number; i++) {
|
|
CardItem *card = c.at(i);
|
|
addCard(new CardItem(player, card->getName(), card->getId(), revealZone, this), false, i);
|
|
}
|
|
reorganizeCards();
|
|
}
|
|
}
|
|
|
|
void ZoneViewZone::zoneDumpReceived(const Response &r)
|
|
{
|
|
const Response_DumpZone &resp = r.GetExtension(Response_DumpZone::ext);
|
|
const int respCardListSize = resp.zone_info().card_list_size();
|
|
for (int i = 0; i < respCardListSize; ++i) {
|
|
const ServerInfo_Card &cardInfo = resp.zone_info().card_list(i);
|
|
auto cardName = QString::fromStdString(cardInfo.name());
|
|
auto *card = new CardItem(player, cardName, cardInfo.id(), revealZone, this, this);
|
|
cards.insert(i, card);
|
|
}
|
|
reorganizeCards();
|
|
emit cardCountChanged();
|
|
}
|
|
|
|
// Because of boundingRect(), this function must not be called before the zone was added to a scene.
|
|
void ZoneViewZone::reorganizeCards()
|
|
{
|
|
int cardCount = cards.size();
|
|
if (!origZone->contentsKnown())
|
|
for (int i = 0; i < cardCount; ++i)
|
|
cards[i]->setId(i);
|
|
|
|
int cols = floor(sqrt((double)cardCount / 2));
|
|
if (cols > 7)
|
|
cols = 7;
|
|
int rows = ceil((double)cardCount / cols);
|
|
if (rows < 1)
|
|
rows = 1;
|
|
if (minRows == 0)
|
|
minRows = rows;
|
|
else if (rows < minRows) {
|
|
rows = minRows;
|
|
cols = ceil((double)cardCount / minRows);
|
|
}
|
|
if (cols < 2)
|
|
cols = 2;
|
|
|
|
qDebug() << "reorganizeCards: rows=" << rows << "cols=" << cols;
|
|
|
|
CardList cardsToDisplay(cards);
|
|
if (sortByName || sortByType)
|
|
cardsToDisplay.sort((sortByName ? CardList::SortByName : 0) | (sortByType ? CardList::SortByType : 0));
|
|
|
|
int typeColumn = 0;
|
|
int longestRow = 0;
|
|
if (pileView && sortByType) { // we need sort by type enabled for the feature to work
|
|
int typeRow = 0;
|
|
QString lastCardType;
|
|
for (int i = 0; i < cardCount; i++) {
|
|
CardItem *c = cardsToDisplay.at(i);
|
|
QString cardType = c->getInfo() ? c->getInfo()->getMainCardType() : "";
|
|
|
|
if (i) { // if not the first card
|
|
if (cardType == lastCardType)
|
|
typeRow++; // add below current card
|
|
else { // if no match then move card to next column
|
|
typeColumn++;
|
|
typeRow = 0;
|
|
}
|
|
}
|
|
|
|
lastCardType = cardType;
|
|
qreal x = 7 + (typeColumn * CARD_WIDTH);
|
|
qreal y = typeRow * CARD_HEIGHT / 3;
|
|
c->setPos(x + 5, y + 5);
|
|
c->setRealZValue(i);
|
|
longestRow = qMax(typeRow, longestRow);
|
|
}
|
|
} else {
|
|
for (int i = 0; i < cardCount; i++) {
|
|
CardItem *c = cardsToDisplay.at(i);
|
|
qreal x = 7 + ((i / rows) * CARD_WIDTH);
|
|
qreal y = (i % rows) * CARD_HEIGHT / 3;
|
|
c->setPos(x + 5, y + 5);
|
|
c->setRealZValue(i);
|
|
}
|
|
}
|
|
|
|
qreal aleft = 0;
|
|
qreal atop = 0;
|
|
qreal awidth = (pileView && sortByType) ? qMax(typeColumn + 1, 3) * CARD_WIDTH + (CARD_WIDTH / 2)
|
|
: qMax(cols, 1) * CARD_WIDTH + (CARD_WIDTH / 2);
|
|
qreal aheight = (pileView && sortByType) ? (longestRow * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3
|
|
: (rows * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3;
|
|
optimumRect = QRectF(aleft, atop, awidth, aheight);
|
|
|
|
updateGeometry();
|
|
emit optimumRectChanged();
|
|
}
|
|
|
|
void ZoneViewZone::setSortByName(int _sortByName)
|
|
{
|
|
sortByName = _sortByName;
|
|
reorganizeCards();
|
|
}
|
|
|
|
void ZoneViewZone::setSortByType(int _sortByType)
|
|
{
|
|
sortByType = _sortByType;
|
|
if (!sortByType)
|
|
pileView = false;
|
|
reorganizeCards();
|
|
}
|
|
|
|
void ZoneViewZone::setPileView(int _pileView)
|
|
{
|
|
pileView = _pileView;
|
|
reorganizeCards();
|
|
}
|
|
|
|
void ZoneViewZone::addCardImpl(CardItem *card, int x, int /*y*/)
|
|
{
|
|
cards.insert(x, card);
|
|
card->setParentItem(this);
|
|
card->update();
|
|
reorganizeCards();
|
|
}
|
|
|
|
void ZoneViewZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
|
|
CardZone *startZone,
|
|
const QPoint & /*dropPoint*/)
|
|
{
|
|
Command_MoveCard cmd;
|
|
cmd.set_start_player_id(startZone->getPlayer()->getId());
|
|
cmd.set_start_zone(startZone->getName().toStdString());
|
|
cmd.set_target_player_id(player->getId());
|
|
cmd.set_target_zone(getName().toStdString());
|
|
cmd.set_x(0);
|
|
cmd.set_y(0);
|
|
|
|
for (int i = 0; i < dragItems.size(); ++i)
|
|
cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
|
|
|
|
player->sendGameCommand(cmd);
|
|
}
|
|
|
|
void ZoneViewZone::removeCard(int position)
|
|
{
|
|
if (position >= cards.size())
|
|
return;
|
|
|
|
CardItem *card = cards.takeAt(position);
|
|
card->deleteLater();
|
|
reorganizeCards();
|
|
}
|
|
|
|
void ZoneViewZone::setGeometry(const QRectF &rect)
|
|
{
|
|
prepareGeometryChange();
|
|
setPos(rect.x(), rect.y());
|
|
bRect = QRectF(0, 0, rect.width(), rect.height());
|
|
}
|
|
|
|
QSizeF ZoneViewZone::sizeHint(Qt::SizeHint /*which*/, const QSizeF & /*constraint*/) const
|
|
{
|
|
return optimumRect.size();
|
|
}
|
|
|
|
void ZoneViewZone::setWriteableRevealZone(bool _writeableRevealZone)
|
|
{
|
|
if (writeableRevealZone && !_writeableRevealZone) {
|
|
origZone->getViews().append(this);
|
|
} else if (!writeableRevealZone && _writeableRevealZone) {
|
|
origZone->getViews().removeOne(this);
|
|
}
|
|
writeableRevealZone = _writeableRevealZone;
|
|
}
|
|
|
|
void ZoneViewZone::wheelEvent(QGraphicsSceneWheelEvent *event)
|
|
{
|
|
emit wheelEventReceived(event);
|
|
}
|