diff options
| author | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
| commit | 490862919d79369112c75955a9c36ff8a081efd3 (patch) | |
| tree | 6fe89466b9c53ba811f298174e6d787bbae71e09 /src/gui/npcdialog.cpp | |
| parent | dff814619d63496acd3c4e8730b828b5d4d931fb (diff) | |
| parent | d873da3e8e57480016596f714845c1bc7e712e68 (diff) | |
| download | mv-490862919d79369112c75955a9c36ff8a081efd3.tar.gz mv-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 mv-490862919d79369112c75955a9c36ff8a081efd3.tar.xz mv-490862919d79369112c75955a9c36ff8a081efd3.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/npcdialog.cpp')
| -rw-r--r-- | src/gui/npcdialog.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 3e5b30a9c..dd9e79b46 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -78,7 +78,7 @@ NpcDialog::NpcDialog(int npcId) : setMinWidth(200); setMinHeight(150); - setDefaultSize(260, 200, ImageRect::CENTER); + setDefaultSize(400, 400, ImageRect::CENTER); mItemLinkHandler = new ItemLinkHandler; // Setup output text box @@ -342,9 +342,20 @@ void NpcDialog::parseListItems(const std::string &itemString) mItems.push_back(tmp); if (!mItems.empty()) + { mItemList->setSelected(0); + mItemList->requestFocus(); + } else + { mItemList->setSelected(-1); + } +} + +void NpcDialog::refocus() +{ + if (!mItems.empty()) + mItemList->requestFocus(); } void NpcDialog::textRequest(const std::string &defaultText) @@ -363,7 +374,8 @@ bool NpcDialog::isTextInputFocused() const bool NpcDialog::isInputFocused() const { - return mTextField->isFocused() || mIntField->isFocused(); + return mTextField->isFocused() || mIntField->isFocused() + || mItemList->isFocused(); } bool NpcDialog::isAnyInputFocused() |