From 2c0d643440865fc5cff737a681fcd3c68d23de01 Mon Sep 17 00:00:00 2001
From: Stepland <16676308+Stepland@users.noreply.github.com>
Date: Sat, 7 Mar 2020 00:30:17 +0100
Subject: [PATCH] FIx option menu screen filter and drawing order of Music
 Select

---
 CHANGELOG.md                            |  1 +
 TODO.md                                 |  4 ++--
 src/Screens/MusicSelect/MusicSelect.cpp | 31 ++++---------------------
 3 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dfb923..8a66808 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
         - Async playback
 - Options menu
     - Marker Selection
+    - Fix screen filter not resizing properly
 
 ## Misc
 - Handling Resolution changes
diff --git a/TODO.md b/TODO.md
index d2174e7..ad25246 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,7 +4,7 @@
 ## Music Select Screen
 - Options menu
     - Controller mapping
-    - fix screen filter not resizing properly
+    - Global Offset
 - Visible controls
     - Start Button
 
@@ -19,7 +19,7 @@
 - bound memory usage of Toolkit::Cache
 - Chart Panel
 - Sort menu
-    - Differenciate Sort / Folder
+    - Differenciate Sort / Selection
 - Song Panel click
     - animation
     - cd
diff --git a/src/Screens/MusicSelect/MusicSelect.cpp b/src/Screens/MusicSelect/MusicSelect.cpp
index 1dcc207..f08feb1 100644
--- a/src/Screens/MusicSelect/MusicSelect.cpp
+++ b/src/Screens/MusicSelect/MusicSelect.cpp
@@ -28,11 +28,6 @@ MusicSelect::Screen::Screen(
     black_frame(t_preferences),
     key_mapping()
 {
-    panel_filter.setSize(sf::Vector2f(
-        resources.m_preferences.layout.panel_step()*resources.m_preferences.screen.width*4.f,
-        resources.m_preferences.layout.panel_step()*resources.m_preferences.screen.width*4.f
-    ));
-    Toolkit::set_origin_normalized(panel_filter, 0.5f, 0.5f);
     panel_filter.setFillColor(sf::Color(0,0,0,128));
     std::cout << "loaded MusicSelect::Screen" << std::endl;
 }
@@ -50,16 +45,7 @@ void MusicSelect::Screen::select_chart(sf::RenderWindow& window) {
         resources.m_preferences.layout.ribbon_x*resources.m_preferences.screen.width,
         resources.m_preferences.layout.ribbon_y*resources.m_preferences.screen.width
     );
-    panel_filter.setPosition(
-        sf::Vector2f{resources.m_preferences.layout.ribbon_x + (
-            3.f*resources.m_preferences.layout.panel_spacing + 
-            4.f*resources.m_preferences.layout.panel_size
-        ) / 2.f,
-        resources.m_preferences.layout.ribbon_y + (
-            3.f*resources.m_preferences.layout.panel_spacing + 
-            4.f*resources.m_preferences.layout.panel_size
-        ) / 2.f}*static_cast<float>(resources.m_preferences.screen.width)
-    );
+    panel_filter.setSize(sf::Vector2f{window.getSize()});
     while ((not chart_selected) and window.isOpen()) {
         sf::Event event;
         while (window.pollEvent(event)) {
@@ -87,16 +73,7 @@ void MusicSelect::Screen::select_chart(sf::RenderWindow& window) {
                     resources.m_preferences.layout.ribbon_x*resources.m_preferences.screen.width,
                     resources.m_preferences.layout.ribbon_y*resources.m_preferences.screen.width
                 );
-                panel_filter.setPosition(
-                    sf::Vector2f{resources.m_preferences.layout.ribbon_x + (
-                        3.f*resources.m_preferences.layout.panel_spacing + 
-                        4.f*resources.m_preferences.layout.panel_size
-                    ) / 2.f,
-                    resources.m_preferences.layout.ribbon_y + (
-                        3.f*resources.m_preferences.layout.panel_spacing + 
-                        4.f*resources.m_preferences.layout.panel_size
-                    ) / 2.f}*static_cast<float>(resources.m_preferences.screen.width)
-                );
+                panel_filter.setSize(sf::Vector2f{window.getSize()});
                 if (not resources.options_state.empty()) {
                     resources.options_state.top().get().update();
                 }
@@ -107,15 +84,15 @@ void MusicSelect::Screen::select_chart(sf::RenderWindow& window) {
         }
         ImGui::SFML::Update(window, imguiClock.restart());
         window.clear(sf::Color(7, 23, 53));
-        ribbon.draw_debug();
         window.draw(ribbon);
+        window.draw(song_info);
         if (not resources.options_state.empty()) {
             window.draw(panel_filter);
             window.draw(resources.options_state.top());
         }
         window.draw(button_highlight);
-        window.draw(song_info);
         window.draw(black_frame);
+        ribbon.draw_debug();
         draw_debug();
         ImGui::SFML::Render(window);
         window.display();