mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-19 20:53:52 +00:00
Merge remote-tracking branch 'riothamus/riothamus-b752'
This commit is contained in:
commit
9fe5ff46cd
2 changed files with 15 additions and 2 deletions
|
@ -18,6 +18,8 @@ namespace MWGui
|
|||
mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CountDialog::onOkButtonClicked);
|
||||
mItemEdit->eventEditTextChange += MyGUI::newDelegate(this, &CountDialog::onEditTextChange);
|
||||
mSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &CountDialog::onSliderMoved);
|
||||
// make sure we read the enter key being pressed to accept multiple items
|
||||
mItemEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &CountDialog::onEnterKeyPressed);
|
||||
}
|
||||
|
||||
void CountDialog::open(const std::string& item, const std::string& message, const int maxCount)
|
||||
|
@ -37,6 +39,7 @@ namespace MWGui
|
|||
width,
|
||||
mMainWidget->getHeight());
|
||||
|
||||
// by default, the text edit field has the focus of the keyboard
|
||||
MyGUI::InputManager::getInstance().setKeyFocusWidget(mItemEdit);
|
||||
|
||||
mSlider->setScrollPosition(maxCount-1);
|
||||
|
@ -55,6 +58,15 @@ namespace MWGui
|
|||
setVisible(false);
|
||||
}
|
||||
|
||||
// essentially duplicating what the OK button does if user presses
|
||||
// Enter key
|
||||
void CountDialog::onEnterKeyPressed(MyGUI::EditBox* _sender)
|
||||
{
|
||||
eventOkClicked(NULL, mSlider->getScrollPosition()+1);
|
||||
|
||||
setVisible(false);
|
||||
}
|
||||
|
||||
void CountDialog::onEditTextChange(MyGUI::EditBox* _sender)
|
||||
{
|
||||
if (_sender->getCaption() == "")
|
||||
|
|
|
@ -30,6 +30,7 @@ namespace MWGui
|
|||
void onOkButtonClicked(MyGUI::Widget* _sender);
|
||||
void onEditTextChange(MyGUI::EditBox* _sender);
|
||||
void onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position);
|
||||
void onEnterKeyPressed(MyGUI::EditBox* _sender);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue