summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Dombrowski <stefan@uni-bonn.de>2010-09-02 21:17:08 +0200
committerStefan Dombrowski <stefan@uni-bonn.de>2010-09-02 21:17:08 +0200
commit76ec7d66c0bb691f3409beb2448718a0bcefcc50 (patch)
treec1d5261cb9b1ad60edfed4c162f01af77a2738d1 /src
parentfe08ffb9047bed67474aa8519051a0d4dcab98c5 (diff)
downloadmana-76ec7d66c0bb691f3409beb2448718a0bcefcc50.tar.gz
mana-76ec7d66c0bb691f3409beb2448718a0bcefcc50.tar.bz2
mana-76ec7d66c0bb691f3409beb2448718a0bcefcc50.tar.xz
mana-76ec7d66c0bb691f3409beb2448718a0bcefcc50.zip
Fixing escape key in charselectdialog
* In charselectdialog the requestFocus is now called later, because before it had no effect, since it was called before the characters were present. Having no char with focus has the side effect that the escape key gets ignored. * Removing the code for variable width of CharacterDisplay, because with recent changes it is executed before the characters are present, therefore it had no effect.
Diffstat (limited to 'src')
-rw-r--r--src/gui/charselectdialog.cpp20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index e22c4daf..f8c28c6a 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -164,10 +164,10 @@ CharSelectDialog::CharSelectDialog(LoginData *loginData):
addKeyListener(this);
center();
- mCharacterEntries[0]->requestFocus();
setVisible(true);
Net::getCharHandler()->setCharSelectDialog(this);
+ mCharacterEntries[0]->requestFocus();
}
CharSelectDialog::~CharSelectDialog()
@@ -328,10 +328,10 @@ CharacterDisplay::CharacterDisplay(CharSelectDialog *charSelectDialog):
mCharacter(0),
mPlayerBox(new PlayerBox)
{
- mButton = new Button("wwwwwwwww", "go", charSelectDialog);
- mName = new Label("wwwwwwwwwwwwwwwwwwwwwwww");
- mLevel = new Label("(888)");
- mMoney = new Label("wwwwwwwww");
+ mButton = new Button("", "go", charSelectDialog);
+ mName = new Label("");
+ mLevel = new Label("");
+ mMoney = new Label("");
mDelete = new Button(_("Delete"), "delete", charSelectDialog);
@@ -347,15 +347,7 @@ CharacterDisplay::CharacterDisplay(CharSelectDialog *charSelectDialog):
update();
- // Setting the width so that the largest label fits.
- mName->adjustSize();
- mMoney->adjustSize();
- int width = 74;
- if (width < 20 + mName->getWidth())
- width = 20 + mName->getWidth();
- if (width < 20 + mMoney->getWidth())
- width = 20 + mMoney->getWidth();
- h.reflowLayout(width, 112 + mName->getHeight() + mLevel->getHeight() +
+ h.reflowLayout(80, 112 + mName->getHeight() + mLevel->getHeight() +
mMoney->getHeight() + mButton->getHeight() + mDelete->getHeight());
}