Updated UI features

+ Added a fade to inactive players TableZone
+ Refreshed TableZone, HandZone and DeckView  default background colors

cockatrice/src/tablezone.h

@@ -1,50 +1,152 @@
 #ifndef TABLEZONE_H
 #define TABLEZONE_H
 
+
 #include "selectzone.h"
 #include "abstractcarditem.h"
 
+
+/*
+* TableZone is the grid based rect where CardItems may be placed.
+* It is the main play zone and can be customized with background images.
+*
+* TODO: Refactor methods to make more readable, extract some logic to
+* private methods (Im looking at you TableZone::reorganizeCards())
+*/
 class TableZone : public SelectZone {
     Q_OBJECT
+
 signals:
     void sizeChanged();
-private:
-    static const int boxLineWidth = 10;
-    static const int paddingX = 35;
-    static const int paddingY = 10;
-    static const int marginX = 20;
-    static const int minWidth = 15 * CARD_WIDTH / 2;
 
+private:
+    static const int BOX_LINE_WIDTH = 10;
+    static const int PADDING_X  = 35;
+    static const int PADDING_Y = 10;
+    static const int MARGIN_X = 20;
+    static const int MIN_WIDTH = 15 * CARD_WIDTH / 2;
+    
+    /*
+    Default background color, inactive mask and boarder gradient 
+    */
+    static const QColor BACKGROUND_COLOR;
+    static const QColor FADE_MASK;
+    static const QColor GRADIENT_COLOR;
+    static const QColor GRADIENT_COLORLESS;
+    
+    /*
+       Size and shape variables
+     */
     QMap<int, int> gridPointWidth;
-    int width, height;
+    int width;
+    int height;
     int currentMinimumWidth;
-    QPixmap bgPixmap;
+
+    /*
+       Holds any custom background image for the TableZone
+     */
+    QPixmap backgroundPixelMap;
+
+    /*
+       If this TableZone is currently active
+     */
     bool active;
+
     bool isInverted() const;
-private slots:    
+
+private slots:
+    /**
+       Loads in any found custom background and updates
+     */
     void updateBgPixmap();
+
 public slots:
+    /**
+       Reorganizes CardItems in the TableZone
+     */
     void reorganizeCards();
+
 public:
+    /**
+       Constructs TableZone.
+
+       @param _p the Player
+       @param parent defaults to null
+     */
     TableZone(Player *_p, QGraphicsItem *parent = 0);
+    
+    /**
+       @return a QRectF of the TableZone bounding box.
+     */
     QRectF boundingRect() const;
+
+    /**
+       Render the TableZone
+
+       @param painter 
+       @param option
+     */
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+
+    /**
+       Toggles the selected items as tapped.
+     */
     void toggleTapped();
+
+    /**
+       See HandleDropEventByGrid
+     */
     void handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &dropPoint);
+
+    /**
+       Handles the placement of cards
+     */
     void handleDropEventByGrid(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &gridPoint);
+
+    /**
+       @return CardItem from grid location
+     */
     CardItem *getCardFromGrid(const QPoint &gridPoint) const;
+
+    /**
+       @return CardItem from coordinate location
+     */
     CardItem *getCardFromCoords(const QPointF &point) const;
+
     QPointF mapFromGrid(QPoint gridPoint) const;
     QPoint mapToGrid(const QPointF &mapPoint) const;
     QPointF closestGridPoint(const QPointF &point);
+
+    /**
+       Removes a card from view.
+
+       @param position card position
+       @param cardId id of card to take
+       @param canResize defaults to true
+       @return CardItem that has been removed
+     */
     CardItem *takeCard(int position, int cardId, bool canResize = true);
+
+    /**
+       Resizes the TableZone in case CardItems are within or 
+       outside of the TableZone constraints.
+     */
     void resizeToContents();
+
+    //**************************************************************************
+    // GETTERS AND SETTERS
+    //**************************************************************************
     int getMinimumWidth() const { return currentMinimumWidth; }
-    void setWidth(qreal _width);
+    void setWidth(qreal _width){ prepareGeometryChange(); width = _width;};
     qreal getWidth() const { return width; }
     void setActive(bool _active) { active = _active; update(); }
+
 protected:
     void addCardImpl(CardItem *card, int x, int y);
+
+private:
+    void paintZoneOutline(QPainter *painter);
+    void paintLandDivider(QPainter *painter);
 };
 
 #endif