Skip to content

Commit 01445e5

Browse files
committed
Added topic name to Research Complete popup
UI IMPROVEMENTS BEGIN
1 parent 4c0f5d4 commit 01445e5

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

‎src/Geoscape/ResearchCompleteState.cpp‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ ResearchCompleteState::ResearchCompleteState(Game * game, const RuleResearch * r
4343
_screen = false;
4444

4545
// Create objects
46-
_window = new Window(this, 224, 140, 48, 30, POPUP_BOTH);
46+
_window = new Window(this, 230, 140, 45, 30, POPUP_BOTH);
4747
_btnOk = new TextButton(80, 16, 64, 146);
4848
_btnReport = new TextButton(80, 16, 176, 146);
49-
_txtTitle = new Text(224, 17, 48, 88);
49+
_txtTitle = new Text(230, 17, 45, 70);
50+
_txtResearch = new Text(230, 17, 45, 96);
5051

5152
// Set palette
5253
_game->setPalette(_game->getResourcePack()->getPalette("BACKPALS.DAT")->getColors(Palette::blockOffset(0)), Palette::backPos, 16);
@@ -55,6 +56,7 @@ ResearchCompleteState::ResearchCompleteState(Game * game, const RuleResearch * r
5556
add(_btnOk);
5657
add(_btnReport);
5758
add(_txtTitle);
59+
add(_txtResearch);
5860

5961
centerAllSurfaces();
6062

@@ -66,6 +68,7 @@ ResearchCompleteState::ResearchCompleteState(Game * game, const RuleResearch * r
6668
_btnOk->setText(tr("STR_OK"));
6769
_btnOk->onMouseClick((ActionHandler)&ResearchCompleteState::btnOkClick);
6870
_btnOk->onKeyboardPress((ActionHandler)&ResearchCompleteState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
71+
6972
_btnReport->setColor(Palette::blockOffset(8)+5);
7073
_btnReport->setText(tr("STR_VIEW_REPORTS"));
7174
_btnReport->onMouseClick((ActionHandler)&ResearchCompleteState::btnReportClick);
@@ -75,6 +78,14 @@ ResearchCompleteState::ResearchCompleteState(Game * game, const RuleResearch * r
7578
_txtTitle->setBig();
7679
_txtTitle->setAlign(ALIGN_CENTER);
7780
_txtTitle->setText(tr("STR_RESEARCH_COMPLETED"));
81+
82+
_txtResearch->setColor(Palette::blockOffset(8)+10);
83+
_txtResearch->setAlign(ALIGN_CENTER);
84+
_txtResearch->setBig();
85+
if (research)
86+
{
87+
_txtResearch->setText(tr(research->getName()));
88+
}
7889
}
7990

8091
/**

‎src/Geoscape/ResearchCompleteState.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class RuleResearch;
3636
class ResearchCompleteState : public State
3737
{
3838
Window *_window;
39-
Text *_txtTitle;
39+
Text *_txtTitle, *_txtResearch;
4040
TextButton *_btnReport, *_btnOk;
4141
const RuleResearch * _research, * _bonus;
4242
public:

0 commit comments

Comments
 (0)