Change tab style, floor cleanup

1 files changed, 5 insertions, 4 deletions

diff --git a/src/Tabs.cpp b/src/Tabs.cpp
index 2a4c2f0..d22f959 100644
--- a/src/Tabs.cpp
+++ b/src/Tabs.cpp
@@ -3,6 +3,7 @@
 #include "../include/ResourceLoader.hpp"
 #include "../include/Config.hpp"
 #include "../include/Theme.hpp"
+#include "../include/Utils.hpp"
 #include <SFML/Window/Event.hpp>
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <cmath>
@@ -23,7 +24,7 @@ namespace QuickMedia {
         return tab_height + std::floor(10.0f * get_config().scale);
     }
 
-    Tabs::Tabs(sf::Shader *rounded_rectangle_shader, sf::Color shade_color) : background(sf::Vector2f(1.0f, 1.0f), 10.0f, get_theme().selected_color, rounded_rectangle_shader), shade_color(shade_color) {
+    Tabs::Tabs(sf::Shader *rounded_rectangle_shader, sf::Color shade_color) : background(sf::Vector2f(1.0f, 1.0f), 10.0f, get_theme().background_color, rounded_rectangle_shader), shade_color(shade_color) {
         shade.setFillColor(shade_color);
     }
 
@@ -100,7 +101,7 @@ namespace QuickMedia {
         width_per_tab = std::floor(width / num_visible_tabs);
         const float tab_text_y = std::floor(pos.y + tab_height*0.5f - (tab_text_size + 5.0f*get_config().scale)*0.5f);
         tab_background_width = std::floor(width_per_tab - tab_margin_x*2.0f);
-        background.set_size(sf::Vector2f(tab_background_width, tab_height));
+        background.set_size(sf::Vector2f(tab_background_width, get_shade_height() + std::floor(10.0f * get_config().scale)));
 
         if(shade_color != sf::Color::Transparent) {
             shade.setSize(sf::Vector2f(width, get_shade_height()));
@@ -172,7 +173,7 @@ namespace QuickMedia {
 
             window.draw(gradient_points, 4, sf::Quads);
 
-            sf::RectangleShape line(sf::Vector2f(std::floor(10.0f * get_config().scale), std::floor(2.0f * get_config().scale)));
+            sf::RectangleShape line(vec2f_round(10.0f * get_config().scale, 2.0f * get_config().scale));
             line.setFillColor(get_theme().arrow_color);
             line.setOrigin(line.getSize().x * 0.5f, line.getSize().y * 0.5f);
 
@@ -199,7 +200,7 @@ namespace QuickMedia {
 
             window.draw(gradient_points, 4, sf::Quads);
 
-            sf::RectangleShape line(sf::Vector2f(std::floor(10.0f * get_config().scale), std::floor(2.0f * get_config().scale)));
+            sf::RectangleShape line(vec2f_round(10.0f * get_config().scale, 2.0f * get_config().scale));
             line.setFillColor(get_theme().arrow_color);
             line.setOrigin(line.getSize().x * 0.5f, line.getSize().y * 0.5f);