Decrease gui spacing, padding and remove lines between body items

1 files changed, 8 insertions, 7 deletions

diff --git a/src/Body.cpp b/src/Body.cpp
index 247424b..b7cfe4b 100644
--- a/src/Body.cpp
+++ b/src/Body.cpp
@@ -13,7 +13,7 @@
 
 static const sf::Color front_color(32, 36, 42);
 static const sf::Color back_color(33, 35, 37);
-static const float spacing_y = std::floor(15.0f * QuickMedia::get_ui_scale());
+static const float spacing_y = std::floor(10.0f * QuickMedia::get_ui_scale());
 static const float padding_x = std::floor(10.0f * QuickMedia::get_ui_scale());
 static const float image_padding_x = std::floor(5.0f * QuickMedia::get_ui_scale());
 static const float padding_y = std::floor(5.0f * QuickMedia::get_ui_scale());
@@ -607,11 +607,12 @@ namespace QuickMedia {
                 const bool merge_with_next = next_body_item && body_item_merge_handler && body_item_merge_handler(items[selected_item].get(), next_body_item);
                 if(!merge_with_previous && merge_with_next)
                     page_scroll += spacing_y;
-            } else if(page_scroll < 0.0f && selected_line_top_visible && selected_item_fits_on_screen) {
+            } else if(page_scroll < (merge_with_previous ? spacing_y : 0.0f) && selected_line_top_visible && selected_item_fits_on_screen) {
                 //fprintf(stderr, "bottom!\n");
-                page_scroll = 0.0f;
                 if(merge_with_previous)
-                    page_scroll += spacing_y;
+                    page_scroll = spacing_y;
+                else
+                    page_scroll = 0.0f;
             }
         }
 
@@ -936,9 +937,9 @@ namespace QuickMedia {
             }
         }
 
-        item_separator.setSize(sf::Vector2f(std::max(0.0f, size.x - 20.0f), 1.0f));
-        item_separator.setPosition(item_pos + sf::Vector2f(10.0f, std::floor(item_height + spacing_y * 0.5f)));
-        window.draw(item_separator);
+        //item_separator.setSize(sf::Vector2f(std::max(0.0f, size.x - 20.0f), 1.0f));
+        //item_separator.setPosition(item_pos + sf::Vector2f(10.0f, std::floor(item_height + spacing_y * 0.5f)));
+        //window.draw(item_separator);
 
         if(item_index == selected_item) {
             item_background.setPosition(item_pos);