From 72223b32295643c4d2bb11e03e1838c3df91fe77 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <max.bruker@tu-dortmund.de>
Date: Tue, 4 Jan 2011 17:40:18 +0100
Subject: [PATCH] minor reveal fix

---
 cockatrice/src/gamescene.cpp      |  4 ++--
 cockatrice/src/zoneviewwidget.cpp |  4 ++--
 cockatrice/src/zoneviewwidget.h   |  2 +-
 cockatrice/src/zoneviewzone.cpp   | 10 ++++++----
 cockatrice/src/zoneviewzone.h     |  3 ++-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/cockatrice/src/gamescene.cpp b/cockatrice/src/gamescene.cpp
index d0c94cbf..330ebef5 100644
--- a/cockatrice/src/gamescene.cpp
+++ b/cockatrice/src/gamescene.cpp
@@ -82,7 +82,7 @@ void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numb
                 }
         }
 
-	ZoneViewWidget *item = new ZoneViewWidget(player, player->getZones().value(zoneName), numberCards);
+	ZoneViewWidget *item = new ZoneViewWidget(player, player->getZones().value(zoneName), numberCards, false);
         views.append(item);
         connect(item, SIGNAL(closePressed(ZoneViewWidget *)), this, SLOT(removeZoneView(ZoneViewWidget *)));
 	addItem(item);
@@ -91,7 +91,7 @@ void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numb
 
 void GameScene::addRevealedZoneView(Player *player, CardZone *zone, const QList<ServerInfo_Card *> &cardList)
 {
-	ZoneViewWidget *item = new ZoneViewWidget(player, zone, -2, cardList);
+	ZoneViewWidget *item = new ZoneViewWidget(player, zone, -2, true, cardList);
 	views.append(item);
         connect(item, SIGNAL(closePressed(ZoneViewWidget *)), this, SLOT(removeZoneView(ZoneViewWidget *)));
 	addItem(item);
diff --git a/cockatrice/src/zoneviewwidget.cpp b/cockatrice/src/zoneviewwidget.cpp
index 7179be78..2f124fed 100644
--- a/cockatrice/src/zoneviewwidget.cpp
+++ b/cockatrice/src/zoneviewwidget.cpp
@@ -9,7 +9,7 @@
 #include "protocol_items.h"
 #include "settingscache.h"
 
-ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards, const QList<ServerInfo_Card *> &cardList)
+ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards, bool _revealZone, const QList<ServerInfo_Card *> &cardList)
 	: QGraphicsWidget(0, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint | Qt::WindowTitleHint/* | Qt::WindowCloseButtonHint*/), player(_player)
 {
 	setAttribute(Qt::WA_DeleteOnClose);
@@ -48,7 +48,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberC
 	extraHeight = vbox->sizeHint(Qt::PreferredSize).height();
 	resize(150, 150);
 
-	zone = new ZoneViewZone(player, _origZone, numberCards, this);
+	zone = new ZoneViewZone(player, _origZone, numberCards, _revealZone, this);
 	connect(zone, SIGNAL(optimumRectChanged()), this, SLOT(resizeToZoneContents()));
 	connect(zone, SIGNAL(beingDeleted()), this, SLOT(zoneDeleted()));
 	vbox->addItem(zone);
diff --git a/cockatrice/src/zoneviewwidget.h b/cockatrice/src/zoneviewwidget.h
index 71dcd754..afa63eb3 100644
--- a/cockatrice/src/zoneviewwidget.h
+++ b/cockatrice/src/zoneviewwidget.h
@@ -30,7 +30,7 @@ private slots:
 	void resizeToZoneContents();
 	void zoneDeleted();
 public:
-	ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards = 0, const QList<ServerInfo_Card *> &cardList = QList<ServerInfo_Card *>());
+	ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards = 0, bool _revealZone = false, const QList<ServerInfo_Card *> &cardList = QList<ServerInfo_Card *>());
 	ZoneViewZone *getZone() const { return zone; }
 	void retranslateUi();
 protected:
diff --git a/cockatrice/src/zoneviewzone.cpp b/cockatrice/src/zoneviewzone.cpp
index bcf59775..f8034541 100644
--- a/cockatrice/src/zoneviewzone.cpp
+++ b/cockatrice/src/zoneviewzone.cpp
@@ -5,17 +5,19 @@
 #include "protocol_items.h"
 #include "carddragitem.h"
 
-ZoneViewZone::ZoneViewZone(Player *_p, CardZone *_origZone, int _numberCards, QGraphicsItem *parent)
-	: SelectZone(_p, _origZone->getName(), false, false, true, parent, true), bRect(QRectF()), minRows(0), numberCards(_numberCards), origZone(_origZone), sortByName(false), sortByType(false)
+ZoneViewZone::ZoneViewZone(Player *_p, CardZone *_origZone, int _numberCards, bool _revealZone, QGraphicsItem *parent)
+	: SelectZone(_p, _origZone->getName(), false, false, true, parent, true), bRect(QRectF()), minRows(0), numberCards(_numberCards), origZone(_origZone), revealZone(_revealZone), sortByName(false), sortByType(false)
 {
-	origZone->setView(this);
+	if (!revealZone)
+		origZone->setView(this);
 }
 
 ZoneViewZone::~ZoneViewZone()
 {
 	emit beingDeleted();
 	qDebug("ZoneViewZone destructor");
-	origZone->setView(NULL);
+	if (!revealZone)
+		origZone->setView(NULL);
 }
 
 QRectF ZoneViewZone::boundingRect() const
diff --git a/cockatrice/src/zoneviewzone.h b/cockatrice/src/zoneviewzone.h
index d2208768..d1c1acd2 100644
--- a/cockatrice/src/zoneviewzone.h
+++ b/cockatrice/src/zoneviewzone.h
@@ -15,9 +15,10 @@ private:
 	int minRows, numberCards;
 	void handleDropEvent(CardDragItem *dragItem, CardZone *startZone, const QPoint &dropPoint, bool faceDown);
 	CardZone *origZone;
+	bool revealZone;
 	bool sortByName, sortByType;
 public:
-	ZoneViewZone(Player *_p, CardZone *_origZone, int _numberCards = -1, QGraphicsItem *parent = 0);
+	ZoneViewZone(Player *_p, CardZone *_origZone, int _numberCards = -1, bool _revealZone = false, QGraphicsItem *parent = 0);
 	~ZoneViewZone();
 	QRectF boundingRect() const;
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);