This commit is contained in:
shenweip authored and Henrik Rydgård committed 2013-11-26 18:20:33 +01:00
1 parent 4c6005545b
commit 7832cebacd
6 files changed
+34 -18

No files matched your search

+2 -4
View File
@@ -513,7 +513,7 @@ void MainScreen::CreateViews() {
root_ = new LinearLayout(ORIENT_HORIZONTAL);
leftColumn->ReplaceLayoutParams(new LinearLayoutParams(1.0));
rightColumn->ReplaceLayoutParams(new LinearLayoutParams(300, FILL_PARENT, actionMenuMargins));
root_->Add(leftColumn);
root_->Add(leftColumn);
root_->Add(rightColumn);
}
@@ -705,8 +705,6 @@ GamePauseScreen::~GamePauseScreen() {
}
}
extern bool UMDReplacePermit;
void GamePauseScreen::CreateViews() {
static const int NUM_SAVESLOTS = 5;
@@ -757,7 +755,7 @@ void GamePauseScreen::CreateViews() {
rightColumn->Add(rightColumnItems);
rightColumnItems->SetSpacing(0.0f);
if (UMDReplacePermit) {
if (getUMDReplacePermit()) {
rightColumnItems->Add(new Choice(i->T("Switch UMD")))->OnClick.Handle(this, &GamePauseScreen::OnSwitchUMD);
}
rightColumnItems->Add(new Choice(i->T("Continue")))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);