Move the setting popup button in the tab holder, show it in recent game tab too

Author: iota97

Common/UI/ViewGroup.cpp

@@ -1321,16 +1321,22 @@ std::string GridLayoutList::DescribeText() const {
 TabHolder::TabHolder(Orientation orientation, float stripSize, LayoutParams *layoutParams)
 	: LinearLayout(Opposite(orientation), layoutParams), stripSize_(stripSize) {
 	SetSpacing(0.0f);
+
+	choiceStrip_ = new LinearLayout(orientation, new LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
+	choiceStrip_->SetSpacing(0.0f);
+
 	if (orientation == ORIENT_HORIZONTAL) {
 		tabStrip_ = new ChoiceStrip(orientation, new LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
 		tabStrip_->SetTopTabs(true);
 		tabScroll_ = new ScrollView(orientation, new LayoutParams(FILL_PARENT, WRAP_CONTENT));
-		tabScroll_->Add(tabStrip_);
+		choiceStrip_->Add(tabStrip_);
+		tabScroll_->Add(choiceStrip_);
 		Add(tabScroll_);
 	} else {
 		tabStrip_ = new ChoiceStrip(orientation, new LayoutParams(stripSize, WRAP_CONTENT));
 		tabStrip_->SetTopTabs(true);
-		Add(tabStrip_);
+		choiceStrip_->Add(tabStrip_);
+		Add(choiceStrip_);
 	}
 	tabStrip_->OnChoice.Handle(this, &TabHolder::OnTabClick);
 

Common/UI/ViewGroup.h

@@ -361,6 +361,11 @@ class TabHolder : public LinearLayout {
 		return tabContents;
 	}
 
+	// Add a custom choice next to tab switching strip (current only used for main screen setting).
+	Choice *AddChoice(Choice *c) {
+		return choiceStrip_->Add(c);
+	}
+
 	void SetCurrentTab(int tab, bool skipTween = false);
 
 	int GetCurrentTab() const { return currentTab_; }
@@ -375,6 +380,7 @@ class TabHolder : public LinearLayout {
 	ChoiceStrip *tabStrip_ = nullptr;
 	ScrollView *tabScroll_ = nullptr;
 	AnchorLayout *contents_ = nullptr;
+	LinearLayout *choiceStrip_ = nullptr;
 
 	float stripSize_;
 	int currentTab_ = 0;

UI/MainScreen.cpp

@@ -695,7 +695,6 @@ void GameBrowser::Refresh() {
 		layoutChoice->AddChoice(ImageID("I_LINES"));
 		layoutChoice->SetSelection(*gridStyle_ ? 0 : 1, false);
 		layoutChoice->OnChoice.Handle(this, &GameBrowser::LayoutChange);
-		topBar->Add(new Choice(ImageID("I_GEAR"), new LayoutParams(64.0f, 64.0f)))->OnClick.Handle(this, &GameBrowser::GridSettingsClick);
 		Add(topBar);
 
 		if (*gridStyle_) {
@@ -715,17 +714,6 @@ void GameBrowser::Refresh() {
 			gl->SetSpacing(4.0f);
 			gameList_ = gl;
 		}
-		// Until we can come up with a better space to put it (next to the tabs?) let's get rid of the icon config
-		// button on the Recent tab, it's ugly. You can use the button from the other tabs.
-
-		// LinearLayout *gridOptionColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(64.0, 64.0f));
-		// gridOptionColumn->Add(new Spacer(12.0));
-		// gridOptionColumn->Add(new Choice(ImageID("I_GEAR"), new LayoutParams(64.0f, 64.0f)))->OnClick.Handle(this, &GameBrowser::GridSettingsClick);
-		// LinearLayout *grid = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
-		// gameList_->ReplaceLayoutParams(new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, 0.75));
-		// grid->Add(gameList_);
-		// grid->Add(gridOptionColumn);
-		// Add(grid);
 		Add(gameList_);
 	}
 
@@ -929,21 +917,24 @@ UI::EventReturn GameBrowser::NavigateClick(UI::EventParams &e) {
 	return UI::EVENT_DONE;
 }
 
-UI::EventReturn GameBrowser::GridSettingsClick(UI::EventParams &e) {
+UI::EventReturn MainScreen::OnGridSettings(UI::EventParams &e) {
 	auto sy = GetI18NCategory("System");
 	auto gridSettings = new GridSettingsScreen(sy->T("Games list settings"));
-	gridSettings->OnRecentChanged.Handle(this, &GameBrowser::OnRecentClear);
+	gridSettings->OnRecentChanged.Handle(this, &MainScreen::OnRecentClear);
 	if (e.v)
 		gridSettings->SetPopupOrigin(e.v);
 
-	screenManager_->push(gridSettings);
+	screenManager()->push(gridSettings);
 	return UI::EVENT_DONE;
 }
 
-UI::EventReturn GameBrowser::OnRecentClear(UI::EventParams &e) {
-	screenManager_->RecreateAllViews();
-	if (host) {
-		host->UpdateUI();
+UI::EventReturn MainScreen::OnRecentClear(UI::EventParams &e) {
+	if (tabHolder_->GetCurrentTab() == 0) {
+		// If we are in recent tab update the tab below
+		RecreateViews();
+	} else {
+		// If not schedule for dialog finish (avoid losing the current game list)
+		recreateViewOnDialogFinish_ = true;
 	}
 	return UI::EVENT_DONE;
 }
@@ -1091,6 +1082,7 @@ void MainScreen::CreateViews() {
 		leftColumn->Add(new Spacer(new LinearLayoutParams(0.1f)));
 	}
 
+	tabHolder_->AddChoice(new Choice(ImageID("I_GEAR"), new LayoutParams(64.0f, 64.0f)))->OnClick.Handle(this, &MainScreen::OnGridSettings);
 	ViewGroup *rightColumn = new ScrollView(ORIENT_VERTICAL);
 	LinearLayout *rightColumnItems = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
 	rightColumnItems->SetSpacing(0.0f);
@@ -1426,6 +1418,10 @@ void MainScreen::dialogFinished(const Screen *dialog, DialogResult result) {
 		backFromStore_ = true;
 		RecreateViews();
 	}
+	if (recreateViewOnDialogFinish_) {
+		recreateViewOnDialogFinish_ = false;
+		RecreateViews();
+	}
 	if (dialog->tag() == "game") {
 		if (!restoreFocusGamePath_.empty() && UI::IsFocusMovementEnabled()) {
 			// Prevent the background from fading, since we just were displaying it.

UI/MainScreen.h

@@ -76,8 +76,6 @@ class GameBrowser : public UI::LinearLayout {
 	UI::EventReturn StorageClick(UI::EventParams &e);
 	UI::EventReturn OnHomeClick(UI::EventParams &e);
 	UI::EventReturn PinToggleClick(UI::EventParams &e);
-	UI::EventReturn GridSettingsClick(UI::EventParams &e);
-	UI::EventReturn OnRecentClear(UI::EventParams &e);
 	UI::EventReturn OnHomebrewStore(UI::EventParams &e);
 
 	UI::ViewGroup *gameList_ = nullptr;
@@ -130,6 +128,8 @@ class MainScreen : public UIScreenWithBackground {
 	UI::EventReturn OnDismissUpgrade(UI::EventParams &e);
 	UI::EventReturn OnAllowStorage(UI::EventParams &e);
 	UI::EventReturn OnFullScreenToggle(UI::EventParams &e);
+	UI::EventReturn OnGridSettings(UI::EventParams &e);
+	UI::EventReturn OnRecentClear(UI::EventParams &e);
 
 	UI::LinearLayout *upgradeBar_ = nullptr;
 	UI::TabHolder *tabHolder_ = nullptr;
@@ -143,6 +143,7 @@ class MainScreen : public UIScreenWithBackground {
 	float highlightProgress_ = 0.0f;
 	float prevHighlightProgress_ = 0.0f;
 	bool backFromStore_ = false;
+	bool recreateViewOnDialogFinish_ = false;
 	bool lockBackgroundAudio_ = false;
 	bool lastVertical_;
 	bool confirmedTemporary_ = false;