diff options
| -rw-r--r-- | engines/macventure/gui.cpp | 10 | ||||
| -rw-r--r-- | engines/macventure/gui.h | 2 | ||||
| -rw-r--r-- | engines/macventure/macventure.cpp | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp index 6a30985b74..8045c27a51 100644 --- a/engines/macventure/gui.cpp +++ b/engines/macventure/gui.cpp @@ -227,7 +227,7 @@ void Gui::initWindows() { loadBorder(_mainGameWindow, "border_no_scroll_act.bmp", true, findWindowData(kMainGameWindow).type); // In-game Output Console - _outConsoleWindow = _wm.addWindow(false, true, true); + _outConsoleWindow = _wm.addWindow(true, true, false); _outConsoleWindow->setDimensions(getWindowData(kOutConsoleWindow).bounds); _outConsoleWindow->setActive(false); _outConsoleWindow->setCallback(outConsoleWindowCallback, this); @@ -1266,15 +1266,19 @@ bool MacVenture::Gui::processMainGameEvents(WindowClick click, Common::Event & e } return false; } + bool MacVenture::Gui::processOutConsoleEvents(WindowClick click, Common::Event & event) { if (_engine->needsClickToContinue()) return true; - debug("OutConsoleEvent: %d", click); - if (click == kBorderScrollUp) { + if (click == kBorderScrollUp && event.type == Common::EVENT_LBUTTONDOWN) { _consoleText->scrollUp(); return true; } + if (click == kBorderScrollDown && event.type == Common::EVENT_LBUTTONDOWN) { + _consoleText->scrollDown(); + return true; + } return getWindowData(kOutConsoleWindow).visible; } diff --git a/engines/macventure/gui.h b/engines/macventure/gui.h index aea6733d2f..902aa8c142 100644 --- a/engines/macventure/gui.h +++ b/engines/macventure/gui.h @@ -364,7 +364,7 @@ public: target->fillRect(target->getBounds(), kColorWhite); const Graphics::Font *font = &_gui->getCurrentFont(); uint y = target->h - font->getFontHeight(); - for (uint i = _lines.size() - 1; i != 0; i--) { + for (uint i = _scrollPos; i != 0; i--) { font->drawString(target, _lines[i], leftOffset, y, font->getStringWidth(_lines[i]), kColorBlack); y -= font->getFontHeight(); } diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp index ff4072dba3..871b10428e 100644 --- a/engines/macventure/macventure.cpp +++ b/engines/macventure/macventure.cpp @@ -714,8 +714,6 @@ void MacVentureEngine::openObject(ObjID objID) { _gui->setWindowTitle(kMainGameWindow, _world->getText(objID, objID, objID)); // it ignores source and target in the original } else { // Open inventory window Common::Point p(_world->getObjAttr(objID, kAttrPosX), _world->getObjAttr(objID, kAttrPosY)); - //getParentWin(obj).localToGlobal(p); - //globalToDesktop(p); WindowReference invID = _gui->createInventoryWindow(objID); _gui->setWindowTitle(invID, _world->getText(objID, objID, objID)); _gui->updateWindowInfo(invID, objID, _world->getChildren(objID, true)); |