games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Merge branch 'master' into 'develop'

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-27 21:15:42 +00:00
parent 319d90cbb4 dfda6d2626
commit 8f074490a7
52 changed files with 864 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/mapView/MapViewController.cpp
View File

@ -73,7 +73,7 @@ void MapViewController::setViewCenter(const Point & position, int level)
adventureInt->onMapViewMoved(model->getTilesTotalRect(), model->getLevel());
}
void MapViewController::setTileSize(const Point & tileSize)
void MapViewController::setTileSize(const Point & tileSize, bool setTarget)
{
Point oldSize = model->getSingleTileSize();
model->setTileSize(tileSize);
@ -88,6 +88,9 @@ void MapViewController::setTileSize(const Point & tileSize)
// force update of view center since changing tile size may invalidated it
setViewCenter(newViewCenter, model->getLevel());
if(setTarget)
targetTileSize = tileSize;
}
void MapViewController::modifyTileSize(int stepsChange, bool useDeadZone)
@ -126,7 +129,7 @@ void MapViewController::modifyTileSize(int stepsChange, bool useDeadZone)
if(actualZoom.y >= defaultTileSize - zoomTileDeadArea && actualZoom.y <= defaultTileSize + zoomTileDeadArea)
actualZoom.y = defaultTileSize;
}
bool isInDeadZone = targetTileSize != actualZoom || actualZoom == Point(defaultTileSize, defaultTileSize);
if(!wasInDeadZone && isInDeadZone)
@ -134,7 +137,13 @@ void MapViewController::modifyTileSize(int stepsChange, bool useDeadZone)
wasInDeadZone = isInDeadZone;
setTileSize(actualZoom);
setTileSize(actualZoom, false);
if (adventureContext)
{
Settings tileZoom = settings.write["adventure"]["tileZoom"];
tileZoom->Integer() = actualZoom.x;
}
}
}
@ -225,7 +234,7 @@ void MapViewController::updateState()
adventureContext->settingShowVisitable = settings["session"]["showVisitable"].Bool();
adventureContext->settingShowBlocked = settings["session"]["showBlocked"].Bool();
adventureContext->settingSpellRange = settings["session"]["showSpellRange"].Bool();
adventureContext->settingTextOverlay = ENGINE->isKeyboardAltDown() || ENGINE->input().getNumTouchFingers() == 2;
adventureContext->settingTextOverlay = (ENGINE->isKeyboardAltDown() || ENGINE->input().getNumTouchFingers() == 2) && settings["general"]["enableOverlay"].Bool();
}
}