From c7a89aa1ad853705e103e46ddba52697afb4e40b Mon Sep 17 00:00:00 2001 From: dec05eba Date: Wed, 23 Sep 2020 21:30:48 +0200 Subject: Change lato to NotoSans font, use same color in body selected item as tabs/search --- src/Body.cpp | 3 +-- src/QuickMedia.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Body.cpp b/src/Body.cpp index f6f8d2c..3ebd11e 100644 --- a/src/Body.cpp +++ b/src/Body.cpp @@ -322,7 +322,6 @@ namespace QuickMedia { void Body::draw(sf::RenderWindow &window, sf::Vector2f pos, sf::Vector2f size, const Json::Value &content_progress) { sf::Vector2f scissor_pos = pos; sf::Vector2f scissor_size = size; - size.x = std::max(0.0f, size.x - 5); float image_max_height = 100.0f; const float spacing_y = 15.0f; @@ -342,7 +341,7 @@ namespace QuickMedia { sf::RoundedRectangleShape item_background(sf::Vector2f(1.0f, 1.0f), 10.0f, 10); //item_background.setFillColor(front_color); - item_background.setFillColor(sf::Color(32, 37, 43)); + item_background.setFillColor(sf::Color(55, 60, 68)); //item_background.setOutlineThickness(1.0f); //item_background.setOutlineColor(sf::Color(13, 15, 17)); sf::RectangleShape item_background_shadow; diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index b78ea10..f6b9d61 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -168,12 +168,12 @@ namespace QuickMedia { resources_root = "../../../"; } - if(!font.loadFromFile(resources_root + "fonts/Lato-Regular.ttf")) { - fprintf(stderr, "Failed to load font: Lato-Regular.ttf\n"); + if(!font.loadFromFile(resources_root + "fonts/NotoSans-Regular.ttf")) { + fprintf(stderr, "Failed to load font: NotoSans-Regular.ttf\n"); abort(); } - if(!bold_font.loadFromFile(resources_root + "fonts/Lato-Bold.ttf")) { - fprintf(stderr, "Failed to load font: Lato-Bold.ttf\n"); + if(!bold_font.loadFromFile(resources_root + "fonts/NotoSans-Bold.ttf")) { + fprintf(stderr, "Failed to load font: NotoSans-Bold.ttf\n"); abort(); } body = new Body(this, &font, &bold_font); -- cgit v1.2.3