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 pull request #4425 from IvanSavenko/ui_cleanup

Browse Source 
Remove old code from UI system
This commit is contained in:
Ivan Savenko
2024-08-12 17:16:03 +03:00
committed by GitHub
parent 84f29183c8 c6943e0ab0
commit 79c55bc898
85 changed files with 314 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mapView/MapView.cpp
View File

@ -53,7 +53,7 @@ BasicMapView::BasicMapView(const Point & offset, const Point & dimensions)
, tilesCache(new MapViewCache(model))
, controller(new MapViewController(model, tilesCache))
{
OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
OBJECT_CONSTRUCTION;
pos += offset;
pos.w = dimensions.x;
pos.h = dimensions.y;
@ -105,7 +105,7 @@ void MapView::show(Canvas & to)
MapView::MapView(const Point & offset, const Point & dimensions)
: BasicMapView(offset, dimensions)
{
OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
OBJECT_CONSTRUCTION;
actions = std::make_shared<MapViewActions>(*this, model);
actions->setContext(controller->getContext());