libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 08:06:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NEVERHOOD: Fix issues in the save/load screens

Browse Source 
- Add virtual keyboard support in save/load screens
This commit is contained in:
johndoe123 2013-05-05 12:04:57 +02:00 committed by Willem Jan Palenstijn
parent 78e0d6a3f1
commit 163023a8ed
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engines/neverhood/menumodule.cpp
View File

@ -253,7 +253,7 @@ void MenuModule::handleDeleteGameMenuAction(bool doDelete) {
void MenuModule::loadSavegameList() { void MenuModule::loadSavegameList() {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::SaveFileManager *saveFileMan = _vm->_system->getSavefileManager();
Neverhood::NeverhoodEngine::SaveHeader header; Neverhood::NeverhoodEngine::SaveHeader header;
Common::String pattern = _vm->getTargetName(); Common::String pattern = _vm->getTargetName();
pattern += ".???"; pattern += ".???";
@ -606,22 +606,28 @@ void TextEditWidget::initialize() {
_parentScene, _baseObjectPriority + 1, _baseSurfacePriority + 1, _parentScene, _baseObjectPriority + 1, _baseSurfacePriority + 1,
(const byte*)_entryString.c_str(), _entryString.size(), _surface, _x, _y, _fontSurface); (const byte*)_entryString.c_str(), _entryString.size(), _surface, _x, _y, _fontSurface);
_textLabelWidget->initialize(); _textLabelWidget->initialize();
cursorSpriteResource.load(_cursorFileHash, true); if (_cursorFileHash != 0) {
_cursorSurface = new BaseSurface(_vm, 0, cursorSpriteResource.getDimensions().width, cursorSpriteResource.getDimensions().height); cursorSpriteResource.load(_cursorFileHash, true);
_cursorSurface->drawSpriteResourceEx(cursorSpriteResource, false, false, cursorSpriteResource.getDimensions().width, cursorSpriteResource.getDimensions().height); _cursorSurface = new BaseSurface(_vm, 0, cursorSpriteResource.getDimensions().width, cursorSpriteResource.getDimensions().height);
_cursorSurface->setVisible(!_readOnly); _cursorSurface->drawSpriteResourceEx(cursorSpriteResource, false, false, cursorSpriteResource.getDimensions().width, cursorSpriteResource.getDimensions().height);
_cursorSurface->setVisible(!_readOnly);
}
refresh(); refresh();
} }
void TextEditWidget::enterWidget() { void TextEditWidget::enterWidget() {
if (!_readOnly) if (!_readOnly) {
_cursorSurface->setVisible(true); _cursorSurface->setVisible(true);
_vm->_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
}
refresh(); refresh();
} }
void TextEditWidget::exitWidget() { void TextEditWidget::exitWidget() {
if (!_readOnly) if (!_readOnly) {
_cursorSurface->setVisible(false); _cursorSurface->setVisible(false);
_vm->_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
}
refresh(); refresh();
} }
@ -709,7 +715,8 @@ void TextEditWidget::handleKeyDown(Common::KeyCode keyCode) {
void TextEditWidget::refresh() { void TextEditWidget::refresh() {
refreshPosition(); refreshPosition();
updateString(); updateString();
drawCursor(); if (_cursorFileHash != 0)
drawCursor();
} }
void TextEditWidget::update() { void TextEditWidget::update() {
@ -750,7 +757,9 @@ void SavegameListBox::onClick() {
mousePos.y -= _y + _rect.y1; mousePos.y -= _y + _rect.y1;
if (mousePos.x >= 0 && mousePos.x <= _rect.x2 - _rect.x1 && if (mousePos.x >= 0 && mousePos.x <= _rect.x2 - _rect.x1 &&
mousePos.y >= 0 && mousePos.y <= _rect.y2 - _rect.y1) { mousePos.y >= 0 && mousePos.y <= _rect.y2 - _rect.y1) {
int newIndex = _firstVisibleItem + mousePos.y / _fontSurface->getCharHeight(); // We add 1 to the char height to ensure that the correct entry is chosen if the
// user clicks at the bottom the text entry
int newIndex = _firstVisibleItem + mousePos.y / (_fontSurface->getCharHeight() + 1);
if (newIndex <= _lastVisibleItem) { if (newIndex <= _lastVisibleItem) {
_currIndex = newIndex; _currIndex = newIndex;
refresh(); refresh();
@ -769,7 +778,7 @@ void SavegameListBox::initialize() {
_surface->setVisible(true); _surface->setVisible(true);
buildItems(); buildItems();
_firstVisibleItem = 0; _firstVisibleItem = 0;
_lastVisibleItem = MIN(_maxVisibleItemsCount, (int)_textLabelItems.size()); _lastVisibleItem = MIN(_maxVisibleItemsCount, (int)_textLabelItems.size()) - 1;
refresh(); refresh();
} }
@ -789,7 +798,7 @@ void SavegameListBox::buildItems() {
void SavegameListBox::drawItems() { void SavegameListBox::drawItems() {
for (int i = 0; i < (int)_textLabelItems.size(); ++i) { for (int i = 0; i < (int)_textLabelItems.size(); ++i) {
TextLabelWidget *label = _textLabelItems[i]; TextLabelWidget *label = _textLabelItems[i];
if (i >= _firstVisibleItem && i < _lastVisibleItem) { if (i >= _firstVisibleItem && i <= _lastVisibleItem) {
label->setY(_rect.y1 + (i - _firstVisibleItem) * _fontSurface->getCharHeight()); label->setY(_rect.y1 + (i - _firstVisibleItem) * _fontSurface->getCharHeight());
label->updateBounds(); label->updateBounds();
label->drawString(_maxStringLength); label->drawString(_maxStringLength);