aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1047 from poixen/move_filter_boxes

Browse source 
Updated reveal zone check boxes
This commit is contained in:
Zach 2015-05-04 10:47:44 -04:00
commit 399122f49d
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cockatrice/src/zoneviewwidget.cpp
View file

@ -79,14 +79,21 @@ ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberC
vbox->addItem(hbox); vbox->addItem(hbox);
QGraphicsLinearLayout *hPilebox = 0;
if (numberCards < 0) { if (numberCards < 0) {
hPilebox = new QGraphicsLinearLayout(Qt::Horizontal);
QGraphicsLinearLayout *hFilterbox = new QGraphicsLinearLayout(Qt::Horizontal);
QGraphicsProxyWidget *sortByNameProxy = new QGraphicsProxyWidget; QGraphicsProxyWidget *sortByNameProxy = new QGraphicsProxyWidget;
sortByNameProxy->setWidget(&sortByNameCheckBox); sortByNameProxy->setWidget(&sortByNameCheckBox);
vbox->addItem(sortByNameProxy); hFilterbox->addItem(sortByNameProxy);
QGraphicsProxyWidget *sortByTypeProxy = new QGraphicsProxyWidget; QGraphicsProxyWidget *sortByTypeProxy = new QGraphicsProxyWidget;
sortByTypeProxy->setWidget(&sortByTypeCheckBox); sortByTypeProxy->setWidget(&sortByTypeCheckBox);
vbox->addItem(sortByTypeProxy); hFilterbox->addItem(sortByTypeProxy);
vbox->addItem(hFilterbox);
QGraphicsProxyWidget *lineProxy = new QGraphicsProxyWidget; QGraphicsProxyWidget *lineProxy = new QGraphicsProxyWidget;
QFrame *line = new QFrame; QFrame *line = new QFrame;
@ -97,16 +104,18 @@ ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberC
QGraphicsProxyWidget *pileViewProxy = new QGraphicsProxyWidget; QGraphicsProxyWidget *pileViewProxy = new QGraphicsProxyWidget;
pileViewProxy->setWidget(&pileViewCheckBox); pileViewProxy->setWidget(&pileViewCheckBox);
vbox->addItem(pileViewProxy); hPilebox->addItem(pileViewProxy);
} }
if (_origZone->getIsShufflable() && (numberCards == -1)) { if (_origZone->getIsShufflable() && (numberCards == -1)) {
shuffleCheckBox.setChecked(true); shuffleCheckBox.setChecked(true);
QGraphicsProxyWidget *shuffleProxy = new QGraphicsProxyWidget; QGraphicsProxyWidget *shuffleProxy = new QGraphicsProxyWidget;
shuffleProxy->setWidget(&shuffleCheckBox); shuffleProxy->setWidget(&shuffleCheckBox);
vbox->addItem(shuffleProxy); hPilebox->addItem(shuffleProxy);
} }
vbox->addItem(hPilebox);
extraHeight = vbox->sizeHint(Qt::PreferredSize).height(); extraHeight = vbox->sizeHint(Qt::PreferredSize).height();
resize(150, 150); resize(150, 150);