forgot to save last changes
This commit is contained in:
parent
9208bf7b5a
commit
c8d5ca1cfb
|
@ -33,7 +33,7 @@ Map g_map;
|
||||||
|
|
||||||
Map::Map()
|
Map::Map()
|
||||||
{
|
{
|
||||||
setVisibleSize(Size(MAP_VISIBLE_WIDTH, MAP_VISIBLE_HEIGHT) + Size(8, 2));
|
setVisibleSize(Size(MAP_VISIBLE_WIDTH, MAP_VISIBLE_HEIGHT));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Map::draw(const Rect& rect)
|
void Map::draw(const Rect& rect)
|
||||||
|
|
|
@ -78,15 +78,6 @@ void UIMap::onGeometryUpdate(const Rect& oldRect, const Rect& newRect)
|
||||||
Size mapSize(g_map.getVibibleSize().width() * Map::NUM_TILE_PIXELS, g_map.getVibibleSize().height() * Map::NUM_TILE_PIXELS);
|
Size mapSize(g_map.getVibibleSize().width() * Map::NUM_TILE_PIXELS, g_map.getVibibleSize().height() * Map::NUM_TILE_PIXELS);
|
||||||
mapSize.scale(mapRect.size(), Fw::KeepAspectRatio);
|
mapSize.scale(mapRect.size(), Fw::KeepAspectRatio);
|
||||||
|
|
||||||
|
|
||||||
/*bool useHeight = ((float)mapRect.width() / mapRect.height() < (float)mapSize.width() / mapSize.height());
|
|
||||||
if(useHeight) {
|
|
||||||
mapRect.setWidth(mapRect.height() * ((float)mapSize.width() / mapSize.height()));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
mapRect.setHeight(mapRect.width() * ((float)mapSize.width() / mapSize.height()));
|
|
||||||
}*/
|
|
||||||
|
|
||||||
m_mapRect.setSize(mapSize);
|
m_mapRect.setSize(mapSize);
|
||||||
m_mapRect.moveCenter(newRect.center());
|
m_mapRect.moveCenter(newRect.center());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue