improve song-preview ui a bit

Author: matcool

song-preview/CMakeLists.txt

@@ -1,4 +1,6 @@
 add_library(song-preview SHARED main.cpp)
 
 target_link_libraries(song-preview UIBuilder)
-setup_geode_mod(song-preview)
+setup_geode_mod(song-preview)
+
+target_compile_definitions(song-preview PRIVATE _CRT_SECURE_NO_WARNINGS=1)

song-preview/about.md

@@ -6,9 +6,3 @@ Waveform code based off [config's code for his 2.1 mod](https://github.com/cgytr
 
 To use this mod, go into the editor and press play when picking a custom song. There you can
 seek the song by clicking on the waveform, and pick a start offset by dragging the cursor on top.
-
-## TODO:
-- [X] Actually be able to type in the start offset input
-- [X] Add song title to popup
-- [ ] Design custom button for seek to start offset
-- [ ] Clean up code

song-preview/main.cpp

@@ -165,6 +165,8 @@ class DetailedAudioPreviewPopup : public geode::Popup<SongInfoObject*, CustomSon
 	CCSize m_widgetSize;
 	CCSize m_barSize;
 	CustomSongWidget* m_parentWidget = nullptr;
+	CCMenuItemSpriteExtra* m_playButton = nullptr;
+	bool m_isAlreadyChosenSong = false;
 
 	EventListener<SampleInfo::SampleTask> m_sampleTaskListener;
 
@@ -175,8 +177,10 @@ class DetailedAudioPreviewPopup : public geode::Popup<SongInfoObject*, CustomSon
 		m_parentWidget = parent;
 
 		if (auto* editor = LevelEditorLayer::get()) {
-			if (editor->m_level->m_songID == m_songID)
+			if (editor->m_level->m_songID == m_songID) {
 				m_startOffset = editor->m_levelSettings->m_songOffset;
+				m_isAlreadyChosenSong = true;
+			}
 		}
 
         auto winSize = CCDirector::sharedDirector()->getWinSize();
@@ -271,11 +275,12 @@ class DetailedAudioPreviewPopup : public geode::Popup<SongInfoObject*, CustomSon
 						->setAutoGrowAxis(1.f)
 						->setGap(0.f)
 					)
-					.child(Build<CCSprite>::createSpriteName("GJ_undoBtn_001.png")
+					.child(Build(CircleButtonSprite::createWithSprite("back.png"_spr, 1.f, CircleBaseColor::Green, CircleBaseSize::Small))
 						.intoMenuItem(this, menu_selector(DetailedAudioPreviewPopup::onGoToStartOffset))
 					)
-					.child(Build<CCSprite>::createSpriteName("GJ_playMusicBtn_001.png")
+					.child(Build<CCSprite>::createSpriteName("GJ_pauseBtn_001.png")
 						.intoMenuItem(this, menu_selector(DetailedAudioPreviewPopup::onPlay))
+						.store(m_playButton)
 					)
 					.updateLayout()
 				)
@@ -474,11 +479,15 @@ class DetailedAudioPreviewPopup : public geode::Popup<SongInfoObject*, CustomSon
 	void onPlay(CCObject*) {
 		auto path = MusicDownloadManager::sharedState()->pathForSong(m_songID);
 		auto* engine = FMODAudioEngine::sharedEngine();
+		const char* sprite;
 		if (engine->isMusicPlaying(0)) {
 			engine->pauseMusic(0);
+			sprite = "GJ_playMusicBtn_001.png";
 		} else {
 			engine->playMusic(path, false, 0.f, 0);
+			sprite = "GJ_pauseBtn_001.png";
 		}
+		m_playButton->setNormalImage(CCSprite::createWithSpriteFrameName(sprite));
 	}
 
 	void onGoToStartOffset(CCObject*) {
@@ -496,6 +505,14 @@ class DetailedAudioPreviewPopup : public geode::Popup<SongInfoObject*, CustomSon
 		this->onClose(nullptr);
 	}
 
+	void onClose(CCObject* obj) override {
+		if (auto* editor = LevelEditorLayer::get(); editor && m_isAlreadyChosenSong) {
+			editor->m_levelSettings->m_songOffset = m_startOffset;
+		}
+
+		Popup::onClose(obj);
+	}
+
     void textChanged(CCTextInputNode* input) override {
 		// try to parse it, ignore if it fails
 		auto str = input->getString();

song-preview/mod.json

@@ -5,7 +5,7 @@
 		"android": "2.2074",
 		"mac": "2.2074"
 	},
-	"version": "1.1.1",
+	"version": "1.2.0",
 	"id": "mat.song-preview",
 	"name": "Advanced Song Preview",
 	"developer": "mat",
@@ -18,7 +18,7 @@
 	],
 	"resources": {
 		"sprites": [
-			"res/cursor.png"
+			"res/*.png"
 		]
 	},
 	"links": {