From 551fa4d1e90d8f197bfd2ef6f06f933592dd2450 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Wed, 30 May 2018 09:24:54 +0200 Subject: Change top and side panel font size --- src/ChannelTopPanel.cpp | 5 ++--- src/UsersSidePanel.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/ChannelTopPanel.cpp b/src/ChannelTopPanel.cpp index 541d333..df69a17 100644 --- a/src/ChannelTopPanel.cpp +++ b/src/ChannelTopPanel.cpp @@ -16,9 +16,9 @@ namespace dchat sf::Color sideColor, centerColor; }; - const float FONT_SIZE = 40.0f; + const float FONT_SIZE = 30.0f; const float BOTTOM_LINE_HEIGHT = 2.0f; - const float PADDING_TOP = 20.0f; + const float PADDING_TOP = 15.0f; const float PADDING_BOTTOM = PADDING_TOP; const float PADDING_SIDE = 20.0f; @@ -67,7 +67,6 @@ namespace dchat str += sf::String::fromUtf8(currentChannel->getName().begin(), currentChannel->getName().end()); float fontSize = FONT_SIZE * Settings::getScaling(); sf::Text text(str, *ResourceCache::getFont("fonts/Nunito-Regular.ttf"), fontSize); - auto textBounds = text.getLocalBounds(); text.setPosition(floor(ChannelSidePanel::getWidth() + PADDING_SIDE * Settings::getScaling()), PADDING_TOP); text.setFillColor(ColorScheme::getTextRegularColor()); window.draw(text); diff --git a/src/UsersSidePanel.cpp b/src/UsersSidePanel.cpp index dcfd1dd..3e078cd 100644 --- a/src/UsersSidePanel.cpp +++ b/src/UsersSidePanel.cpp @@ -109,7 +109,7 @@ namespace dchat // TODO: Remove this shit sf::String str = "Online - "; str += to_string(numOnlineUsers); - sf::Text text(str, *font, textHeight * 1.0f); + sf::Text text(str, *font, FONT_SIZE * Settings::getScaling()); text.setPosition(position); text.setFillColor(ColorScheme::getTextRegularColor() * sf::Color(255, 255, 255, 100)); window.draw(text); -- cgit v1.2.3