From 1e822e1ef0c6184ae02dc804c1ce5c866fad4c7c Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 1 May 2018 16:51:37 +0200 Subject: Increase chatbar font size, remove last line in chat --- src/MessageBoard.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/MessageBoard.cpp') diff --git a/src/MessageBoard.cpp b/src/MessageBoard.cpp index 6c75399..9dbeb71 100644 --- a/src/MessageBoard.cpp +++ b/src/MessageBoard.cpp @@ -174,8 +174,10 @@ namespace dchat sf::Vector2 position(ChannelSidePanel::getWidth(), ChannelTopPanel::getHeight() + PADDING_TOP); double startHeight = position.y; position.y += scroll; - for(Message *message : messages) + usize numMessages = messages.size(); + for(usize i = 0; i < numMessages; ++i) { + Message *message = messages[i]; position.y += (MESSAGE_PADDING_TOP * Settings::getScaling()); if(position.y + usernameTextHeight > 0.0f && position.y < backgroundPos.y + backgroundSize.y) { @@ -206,7 +208,7 @@ namespace dchat message->text.draw(window, cache); position.y += (message->text.getHeight() + MESSAGE_PADDING_BOTTOM * Settings::getScaling()); - if(position.y + LINE_HEIGHT > 0.0f && position.y < backgroundPos.y + backgroundSize.y) + if(position.y + LINE_HEIGHT > 0.0f && position.y < backgroundPos.y + backgroundSize.y && i + 1 != numMessages) { lineRect.setPosition(sf::Vector2f(position.x + LINE_SIDE_PADDING, floor(position.y))); window.draw(lineRect); -- cgit v1.2.3