libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 01:07:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: RT: Fix display of lines in inventory dialog

Browse Source
This commit is contained in:
Paul Gilbert 2015-06-29 21:53:40 -04:00
parent 03adfa2b96
commit 93072407bc
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
engines/sherlock/tattoo/widget_inventory.cpp
View File

@ -67,7 +67,7 @@ void WidgetInventoryTooltip::setText(const Common::String &str) {
} else {
line1 = Common::String(str.c_str(), space);
line2 = Common::String(space + 1);
int height = _surface.stringHeight(line1) + _surface.stringHeight(line2) + 4;
height = _surface.stringHeight(line1) + _surface.stringHeight(line2) + 4;
}
break;
} else {
@ -292,9 +292,36 @@ void WidgetInventory::load(int mode) {
// Draw the window background and then the inventory on top of it
makeInfoArea(_surface);
drawBars();
drawInventory();
}
void WidgetInventory::drawBars() {
TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
ImageFile &images = *ui._interfaceImages;
int x;
_surface.hLine(3, INVENTORY_YSIZE + 3, _bounds.width() - 4, INFO_TOP);
_surface.hLine(3, INVENTORY_YSIZE + 4, _bounds.width() - 4, INFO_MIDDLE);
_surface.hLine(3, INVENTORY_YSIZE + 5, _bounds.width() - 4, INFO_BOTTOM);
_surface.transBlitFrom(images[4], Common::Point(0, INVENTORY_YSIZE + 2));
for (int idx = 1; idx <= NUM_INVENTORY_SHOWN / 2; ++idx) {
x = idx * (INVENTORY_XSIZE + 3);
_surface.vLine(x, 3, _bounds.height() - 4, INFO_TOP);
_surface.vLine(x + 1, 3, _bounds.height() - 4, INFO_MIDDLE);
_surface.vLine(x + 2, 3, _bounds.height() - 4, INFO_BOTTOM);
_surface.transBlitFrom(images[6], Common::Point(x - 1, 1));
_surface.transBlitFrom(images[7], Common::Point(x - 1, _bounds.height() - 4));
_surface.transBlitFrom(images[6], Common::Point(x - 1, INVENTORY_YSIZE + 5));
_surface.transBlitFrom(images[7], Common::Point(x - 1, INVENTORY_YSIZE + 2));
}
_surface.hLine(x + 2, INVENTORY_YSIZE + 2, INVENTORY_YSIZE + 8, INFO_BOTTOM);
}
void WidgetInventory::drawInventory() {
Inventory &inv = *_vm->_inventory;

5
engines/sherlock/tattoo/widget_inventory.h
View File

@ -81,6 +81,11 @@ private:
Common::Rect _menuBounds, _oldMenuBounds;
Surface _menuSurface;
/**
* Draw the bars within the dialog
*/
void drawBars();
/**
* Draw the scrollbar for the dialog
*/