Improved the appearance and behavior of the "play" button

windows-server-2003 · Nov 28, 2021 · b70cb49 · b70cb49
1 parent edeff32
commit b70cb49
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/romfs/gfx/msg/string_resources_en.txt b/romfs/gfx/msg/string_resources_en.txt
@@ -6,6 +6,7 @@
 <CANCEL>Cancel</CANCEL>
 <OK>OK</OK>
 <PLAY>Play</PLAY>
+<PLAYING>Playing</PLAYING>
 <URL>URL</URL>
 <SETTINGS>Settings</SETTINGS>
 <WATCH_HISTORY>Watch History</WATCH_HISTORY>

diff --git a/romfs/gfx/msg/string_resources_ja.txt b/romfs/gfx/msg/string_resources_ja.txt
@@ -6,6 +6,7 @@
 <CANCEL>キャンセル</CANCEL>
 <OK>OK</OK>
 <PLAY>再生</PLAY>
+<PLAYING>再生中</PLAYING>
 <URL>URL</URL>
 <SETTINGS>設定</SETTINGS>
 <WATCH_HISTORY>履歴</WATCH_HISTORY>

diff --git a/source/scenes/video_player.cpp b/source/scenes/video_player.cpp
@@ -758,15 +758,18 @@ static void load_video_page(void *arg) {
 			{
 				TextView *play_button = (new TextView(0, 0, 160 - SMALL_MARGIN, 20));
 				play_button
-					->set_text((std::function<std::string ()>) [] () { return LOCALIZED(PLAY); })
+					->set_text((std::function<std::string ()>) [] () { return cur_video_info.id == playing_video_info.id ? LOCALIZED(PLAYING) : LOCALIZED(PLAY); })
 					->set_x_alignment(TextView::XAlign::CENTER);
 				if (tmp_video_info.is_playable()) {
 					play_button
 						->set_on_view_released([url] (View &) {
-							send_change_video_request_wo_lock(url, true, false, false);
+							if (cur_video_info.id != playing_video_info.id) send_change_video_request_wo_lock(url, true, false, false);
 						})
-						->set_get_background_color(View::STANDARD_BACKGROUND);
-				} else play_button->set_get_background_color([] (const View &) { return LIGHT2_BACK_COLOR; });
+						->set_get_background_color([] (const View &view) -> u32 {
+							if (cur_video_info.id == playing_video_info.id) return 0xFFFFBBBB;
+							return View::STANDARD_BACKGROUND(view);
+						});
+				} else play_button->set_get_background_color([] (const View &) { return LIGHT1_BACK_COLOR; });
 
 				TextView *reload_button = (new TextView(0, 0, 160 - SMALL_MARGIN, 20));
 				reload_button