mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 22:20:33 +00:00
Code Issues Projects Releases Wiki Activity

Adjust canvas size when switching cells

Browse Source
This commit is contained in:
Evil Eye 2024-11-18 17:11:05 +01:00
parent fc3a1833ee
commit c31c43bed5
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/openmw/mwgui/mapwindow.cpp
View File

@ -102,6 +102,11 @@ namespace
return ESM::Cell::generateIdForCell(true, {}, x, y); return ESM::Cell::generateIdForCell(true, {}, x, y);
return cell.getId(); return cell.getId();
} }
void setCanvasSize(MyGUI::ScrollView* scrollView, const MyGUI::IntRect& grid, int widgetSize)
{
scrollView->setCanvasSize(widgetSize * (grid.width() + 1), widgetSize * (grid.height() + 1));
}
} }
namespace MWGui namespace MWGui
@ -214,8 +219,7 @@ namespace MWGui
mExtCellDistance = cellDistance; mExtCellDistance = cellDistance;
const int mapWidgetSize = Settings::map().mLocalMapWidgetSize; const int mapWidgetSize = Settings::map().mLocalMapWidgetSize;
setCanvasSize(mLocalMap, mGrid, mapWidgetSize);
mLocalMap->setCanvasSize(mapWidgetSize * (mGrid.width() + 1), mapWidgetSize * (mGrid.height() + 1));
mCompass->setDepth(Local_CompassLayer); mCompass->setDepth(Local_CompassLayer);
mCompass->setNeedMouseFocus(false); mCompass->setNeedMouseFocus(false);
@ -378,6 +382,8 @@ namespace MWGui
const int x = cell.getGridX(); const int x = cell.getGridX();
const int y = cell.getGridY(); const int y = cell.getGridY();
MyGUI::IntSize oldSize{ mGrid.width(), mGrid.height() };
if (cell.isExterior()) if (cell.isExterior())
{ {
mGrid = createRect({ x, y }, mExtCellDistance); mGrid = createRect({ x, y }, mExtCellDistance);
@ -445,6 +451,9 @@ namespace MWGui
resetEntry(mMaps[i], false, nullptr); resetEntry(mMaps[i], false, nullptr);
} }
if (oldSize != MyGUI::IntSize{ mGrid.width(), mGrid.height() })
setCanvasSize(mLocalMap, mGrid, getWidgetSize());
// Delay the door markers update until scripts have been given a chance to run. // Delay the door markers update until scripts have been given a chance to run.
// If we don't do this, door markers that should be disabled will still appear on the map. // If we don't do this, door markers that should be disabled will still appear on the map.
mNeedDoorMarkersUpdate = true; mNeedDoorMarkersUpdate = true;
@ -570,15 +579,7 @@ namespace MWGui
{ {
MyGUI::IntRect coord = widget->getAbsoluteRect(); MyGUI::IntRect coord = widget->getAbsoluteRect();
MyGUI::IntRect croppedCoord = cropTo->getAbsoluteRect(); MyGUI::IntRect croppedCoord = cropTo->getAbsoluteRect();
if (coord.left < croppedCoord.left && coord.right < croppedCoord.left) return !coord.intersect(croppedCoord);
return true;
if (coord.left > croppedCoord.right && coord.right > croppedCoord.right)
return true;
if (coord.top < croppedCoord.top && coord.bottom < croppedCoord.top)
return true;
if (coord.top > croppedCoord.bottom && coord.bottom > croppedCoord.bottom)
return true;
return false;
} }
void LocalMapBase::updateRequiredMaps() void LocalMapBase::updateRequiredMaps()
@ -731,7 +732,7 @@ namespace MWGui
void LocalMapBase::updateLocalMap() void LocalMapBase::updateLocalMap()
{ {
auto mapWidgetSize = getWidgetSize(); auto mapWidgetSize = getWidgetSize();
mLocalMap->setCanvasSize(mapWidgetSize * (mGrid.width() + 1), mapWidgetSize * (mGrid.height() + 1)); setCanvasSize(mLocalMap, mGrid, getWidgetSize());
const auto size = MyGUI::IntSize(std::ceil(mapWidgetSize), std::ceil(mapWidgetSize)); const auto size = MyGUI::IntSize(std::ceil(mapWidgetSize), std::ceil(mapWidgetSize));
for (auto& entry : mMaps) for (auto& entry : mMaps)