Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-18 10:26:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Display the letters correctly

Browse source
This commit is contained in:
Olivier Teulière 2010-10-22 16:56:32 +00:00
parent 90027c3210
commit 308e609966
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
qt/board_widget.cpp
View file

@ -121,7 +121,8 @@ private:
};
BoardWidget::BoardWidget(CoordModel &iCoordModel, QWidget *parent)
: QFrame(parent), m_game(NULL), m_coordModel(iCoordModel)
: QFrame(parent), m_game(NULL), m_coordModel(iCoordModel),
m_widgetsMatrix(BOARD_MAX + 1, BOARD_MAX + 1, 0)
{
// Try to have a black background... FIXME: not working well!
QPalette pal = palette();
@ -131,7 +132,7 @@ BoardWidget::BoardWidget(CoordModel &iCoordModel, QWidget *parent)
setForegroundRole(QPalette::Window);
setBackgroundRole(QPalette::Window);
BoardLayout *layout = new BoardLayout(16);
BoardLayout *layout = new BoardLayout(BOARD_MAX + 1);
// Line full of coordinates
layout->addWidget(new BasicTileWidget(this, ""));
for (unsigned int col = BOARD_MIN; col <= BOARD_MAX; ++col)
@ -160,6 +161,7 @@ BoardWidget::BoardWidget(CoordModel &iCoordModel, QWidget *parent)
else if (Board::GetLetterMultiplier(row, col) == 2)
mult = TileWidget::LETTER_DOUBLE;
TileWidget *t = new TileWidget(this, mult);
m_widgetsMatrix[row][col] = t;
layout->addWidget(t);
}
}
@ -194,6 +196,21 @@ void BoardWidget::updateArrow(const Coord &)
void BoardWidget::refresh()
{
if (m_game != NULL)
{
const Board &board = m_game->getBoard();
for (unsigned int row = BOARD_MIN; row <= BOARD_MAX; ++row)
{
for (unsigned int col = BOARD_MIN; col <= BOARD_MAX; ++col)
{
m_widgetsMatrix[row][col]->tileChanged(
board.getTile(row, col),
board.isJoker(row, col),
board.isTestChar(row, col),
false, false);
}
}
}
update();
}

5
qt/board_widget.h
View file

@ -22,10 +22,11 @@
#define BOARD_WIDGET_H_
#include <QtGui/QFrame>
#include "matrix.h"
class QTreeView;
class PublicGame;
class TileWidget;
class CoordModel;
class Coord;
@ -57,6 +58,8 @@ private:
/// Coordinates of the next word to play
CoordModel &m_coordModel;
Matrix<TileWidget*> m_widgetsMatrix;
};
#endif

2
qt/tile_widget.cpp
View file

@ -170,7 +170,7 @@ void TileWidget::paintEvent(QPaintEvent *)
{
painter.setFont(pointsFont);
painter.drawText(xPos + squareSize * (1 - pointsCoeff),
yPos + squareSize * (1 - pointsCoeff) + 1,
yPos + squareSize * (1 - pointsCoeff),
squareSize * pointsCoeff, squareSize * pointsCoeff + 3,
Qt::AlignRight | Qt::AlignBottom,
QString("%1").arg(m_tile.getPoints()));