diff options
| author | Borja Lorente | 2016-07-24 17:39:03 +0200 |
|---|---|---|
| committer | Borja Lorente | 2016-08-14 18:58:57 +0200 |
| commit | fb180a8cdbf7e75c28502a8f3531d78cc5224535 (patch) | |
| tree | 818ac7e56d2d0915a9d7206dbc71d3f8e8d51d36 | |
| parent | 87c6265582f6efa31f6a8dcc77ffe509c3720010 (diff) | |
| download | scummvm-rg350-fb180a8cdbf7e75c28502a8f3531d78cc5224535.tar.gz scummvm-rg350-fb180a8cdbf7e75c28502a8f3531d78cc5224535.tar.bz2 scummvm-rg350-fb180a8cdbf7e75c28502a8f3531d78cc5224535.zip | |
MACVENTURE: Fix gui
| -rw-r--r-- | engines/macventure/gui.cpp | 6 | ||||
| -rw-r--r-- | engines/macventure/windows.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp index 37aef21110..13f0a9d692 100644 --- a/engines/macventure/gui.cpp +++ b/engines/macventure/gui.cpp @@ -232,7 +232,7 @@ void Gui::initWindows() { _outConsoleWindow->setActive(false); _outConsoleWindow->setCallback(outConsoleWindowCallback, this); loadBorder(_outConsoleWindow, "border_left_scroll_inac.bmp", false, findWindowData(kOutConsoleWindow).type); - loadBorder(_outConsoleWindow, "border_left_scroll_inac.bmp", true, findWindowData(kOutConsoleWindow).type); + loadBorder(_outConsoleWindow, "border_left_scroll_act.bmp", true, findWindowData(kOutConsoleWindow).type); // Self Window _selfWindow = _wm.addWindow(false, true, false); @@ -337,7 +337,7 @@ WindowReference Gui::createInventoryWindow(ObjID objRef) { newWindow->setCallback(inventoryWindowCallback, this); newWindow->setCloseable(true); loadBorder(newWindow, "border_both_scroll_inac.bmp", false, newData.type); - loadBorder(newWindow, "border_both_scroll_inac.bmp", true, newData.type); + loadBorder(newWindow, "border_both_scroll_act.bmp", true, newData.type); _inventoryWindows.push_back(newWindow); debug("Create new inventory window. Reference: %d", newData.refcon); @@ -539,7 +539,7 @@ void Gui::drawCommandsWindow() { Graphics::ManagedSurface *srf = _controlsWindow->getSurface(); WindowData data = getWindowData(kCommandsWindow); uint16 border = borderBounds(data.type).topOffset; - srf->fillRect(Common::Rect(border * 2, border * 2, srf->w - (border * 3), srf->h - (border * 3)), kColorWhite); + srf->fillRect(Common::Rect(0, 0, srf->w, srf->h), kColorWhite); getCurrentFont().drawString( srf, _engine->getCommandsPausedString(), diff --git a/engines/macventure/windows.cpp b/engines/macventure/windows.cpp index c89fa9397c..9825349641 100644 --- a/engines/macventure/windows.cpp +++ b/engines/macventure/windows.cpp @@ -31,22 +31,22 @@ BorderBounds borderBounds(MVWindowType type) { case MacVenture::kDBox: break; case MacVenture::kPlainDBox: - return BorderBounds(6, 6, 6, 6); + return BorderBounds(1, 1, 1, 2); case MacVenture::kAltBox: - return BorderBounds(4, 4, 4, 4); // Hand-tested + return BorderBounds(0, 0, 0, 0); // Hand-tested break; case MacVenture::kNoGrowDoc: return BorderBounds(1, 17, 1, 1); case MacVenture::kMovableDBox: break; case MacVenture::kZoomDoc: - return BorderBounds(1, 19, 16, 16); + return BorderBounds(1, 19, 17, 17); case MacVenture::kZoomNoGrow: break; case MacVenture::kRDoc16: break; case MacVenture::kRDoc4: - return BorderBounds(0, 19, 1, 1); + return BorderBounds(1, 19, 1, 1); case MacVenture::kRDoc6: break; case MacVenture::kRDoc10: |