Skip to content

Commit 93d975d

Browse files
Warboy1982Warboy1982
committed
make city name boxes slightly larger
and a couple small geoscape touch ups
1 parent 2ea3726 commit 93d975d

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

‎src/Geoscape/GeoscapeState.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,9 @@ GeoscapeState::GeoscapeState() : _pause(false), _zoomInEffectDone(false), _zoomO
309309
_btn1Day->onKeyboardPress((ActionHandler)&GeoscapeState::btnTimerClick, Options::keyGeoSpeed6);
310310
_btn1Day->setGeoscapeButton(true);
311311

312+
_sideBottom->setGeoscapeButton(true);
313+
_sideTop->setGeoscapeButton(true);
314+
312315
_btnRotateLeft->onMousePress((ActionHandler)&GeoscapeState::btnRotateLeftPress);
313316
_btnRotateLeft->onMouseRelease((ActionHandler)&GeoscapeState::btnRotateLeftRelease);
314317
_btnRotateLeft->onKeyboardPress((ActionHandler)&GeoscapeState::btnRotateLeftPress, Options::keyGeoLeft);

‎src/Geoscape/Globe.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,7 @@ void Globe::drawDetail()
13011301
// Convert coordinates
13021302
polarToCart((*i)->getRules()->getLabelLongitude(), (*i)->getRules()->getLabelLatitude(), &x, &y);
13031303

1304-
label->setX(x - 40);
1304+
label->setX(x - 50);
13051305
label->setY(y);
13061306
label->setText(_game->getLanguage()->getString((*i)->getRules()->getType()));
13071307
label->blit(_countries);
@@ -1313,7 +1313,7 @@ void Globe::drawDetail()
13131313
// Draw the city and base markers
13141314
if (_zoom >= 3)
13151315
{
1316-
Text *label = new Text(80, 9, 0, 0);
1316+
Text *label = new Text(100, 9, 0, 0);
13171317
label->setPalette(getPalette());
13181318
label->initText(_game->getResourcePack()->getFont("FONT_BIG"), _game->getResourcePack()->getFont("FONT_SMALL"), _game->getLanguage());
13191319
label->setAlign(ALIGN_CENTER);
@@ -1333,7 +1333,7 @@ void Globe::drawDetail()
13331333
// Convert coordinates
13341334
polarToCart((*j)->getLongitude(), (*j)->getLatitude(), &x, &y);
13351335

1336-
label->setX(x - 40);
1336+
label->setX(x - 50);
13371337
label->setY(y + 2);
13381338
label->setText((*j)->getName(_game->getLanguage()));
13391339
label->blit(_countries);
@@ -1345,7 +1345,7 @@ void Globe::drawDetail()
13451345
if ((*j)->getMarker() == -1 || pointBack((*j)->getLongitude(), (*j)->getLatitude()))
13461346
continue;
13471347
polarToCart((*j)->getLongitude(), (*j)->getLatitude(), &x, &y);
1348-
label->setX(x - 40);
1348+
label->setX(x - 50);
13491349
label->setY(y + 2);
13501350
label->setColor(BASE_LABEL_COLOR);
13511351
label->setText((*j)->getName());

0 commit comments

Comments
 (0)