Set SelectMusic DifferentialReload to not reset current wheel position

side effect: if hovering a non-song (group, sort) it will open it but not do anything else
etternagame · Jun 20, 2020 · 2a7c41a · 2a7c41a
1 parent d947841
commit 2a7c41a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/src/Etterna/Actor/Menus/MusicWheel.h b/src/Etterna/Actor/Menus/MusicWheel.h
@@ -1,4 +1,4 @@
-/* MusicWheel - A wheel with song names used in the Select Music screen. */
+/* MusicWheel - A wheel with song names used in the Select Music screen. */
 
 #ifndef MUSIC_WHEEL_H
 #define MUSIC_WHEEL_H
@@ -65,6 +65,8 @@ class MusicWheel : public WheelBase
 
 	vector<Song*> allSongsFiltered;
 	map<RString, vector<Song*>> allSongsByGroupFiltered;
+	bool SelectSongOrCourse();
+	void SelectSongAfterSearch();
 
 	// Lua
 	void PushSelf(lua_State* L) override;
@@ -74,7 +76,6 @@ class MusicWheel : public WheelBase
 
 	vector<string> hashList;
 	void GetSongList(vector<Song*>& arraySongs, SortOrder so);
-	bool SelectSongOrCourse();
 	bool SelectModeMenuItem();
 
 	void FilterByStepKeys(vector<Song*>& inv);
@@ -139,7 +140,6 @@ class MusicWheel : public WheelBase
 	void FilterWheelItemDatas(vector<MusicWheelItemData*>& aUnFilteredDatas,
 							  vector<MusicWheelItemData*>& aFilteredData,
 							  SortOrder so);
-	void SelectSongAfterSearch();
 	RString prevSongTitle;
 };
 

diff --git a/src/Etterna/Actor/Menus/WheelBase.cpp b/src/Etterna/Actor/Menus/WheelBase.cpp
@@ -274,6 +274,17 @@ WheelBase::Select() // return true if this selection can end the screen
 	}
 }
 
+RString
+WheelBase::GetCurrentGroup()
+{
+	// current hovering a group
+	if (m_CurWheelItemData[m_iSelection]->m_Type == WheelItemDataType_Section)
+		return m_CurWheelItemData[m_iSelection]->m_sText;
+	else
+		// currently within a group
+		return m_sExpandedSectionName;
+}
+
 WheelItemBaseData*
 WheelBase::GetItem(unsigned int iIndex)
 {

diff --git a/src/Etterna/Actor/Menus/WheelBase.h b/src/Etterna/Actor/Menus/WheelBase.h
@@ -60,6 +60,8 @@ class WheelBase : public ActorFrame
 
 	virtual bool Select(); // return true if this selection can end the screen
 
+	RString GetCurrentGroup();
+
 	WheelState GetWheelState() { return m_WheelState; }
 	void Lock() { m_WheelState = STATE_LOCKED; }
 	bool WheelIsLocked()

diff --git a/src/Etterna/Screen/Others/ScreenSelectMusic.cpp b/src/Etterna/Screen/Others/ScreenSelectMusic.cpp
@@ -377,9 +377,26 @@ ScreenSelectMusic::OpenOptions()
 }
 void
 ScreenSelectMusic::DifferentialReload()
-{
-	SONGMAN->DifferentialReload();
-	m_MusicWheel.ReloadSongList(false, "");
+{
+	// reload songs
+	SONGMAN->DifferentialReload();
+
+	auto selSong = GAMESTATE->m_pCurSong;
+	auto currentHoveredGroup = m_MusicWheel.GetCurrentGroup();
+
+	// reset wheel
+	m_MusicWheel.ReloadSongList(false, "");
+
+	// place selection on the last song we were on
+	// or fall back to section in case no song selected
+	// (forces the section to open if so)
+	if (selSong != nullptr)
+		m_MusicWheel.SelectSongOrCourse();
+	else {
+		m_MusicWheel.SelectSection(currentHoveredGroup);
+		m_MusicWheel.SetOpenSection(currentHoveredGroup);
+	}
+
 }
 
 bool