aboutsummaryrefslogtreecommitdiff
path: root/src/MessagePart.cpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-04-22 05:58:44 +0200
committerdec05eba <dec05eba@protonmail.com>2018-04-22 05:59:18 +0200
commit1e0e68f9cda51c881b32a54d9eece71c1428f7ac (patch)
treeb8faa1d971c245e3fcf046aa1d2daa1fa601e0f9 /src/MessagePart.cpp
parent424b02609fa34175a4e2aadb95e68b3c9c8dc93c (diff)
Add video and gif support
Gif streams from url. Todo: Add play controls to video
Diffstat (limited to 'src/MessagePart.cpp')
-rw-r--r--src/MessagePart.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/MessagePart.cpp b/src/MessagePart.cpp
index 1bde138..215c239 100644
--- a/src/MessagePart.cpp
+++ b/src/MessagePart.cpp
@@ -13,8 +13,8 @@ namespace dchat
return MESSAGE_PART_SIZE * Settings::getScaling();
}
- MessagePartText::MessagePartText(const string &_text) :
- MessagePart(Type::TEXT),
+ MessagePartText::MessagePartText(const string &_text, bool _newLine) :
+ MessagePart(Type::TEXT, _newLine),
text("", ResourceCache::getFont("fonts/Roboto-Regular.ttf"), MessagePartText::getFontSizeScaled())
{
text.setString(sf::String::fromUtf8(_text.begin(), _text.end()));
@@ -35,8 +35,8 @@ namespace dchat
return sf::Vector2f(text.getLocalBounds().width, getFontSizeScaled());
}
- MessagePartEmoji::MessagePartEmoji(const string &_url) :
- MessagePart(Type::EMOJI),
+ MessagePartEmoji::MessagePartEmoji(const string &_url, bool _newLine) :
+ MessagePart(Type::EMOJI, _newLine),
url(_url),
dirty(true)
{