aboutsummaryrefslogtreecommitdiff
path: root/src/MessageBoard.cpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-05-09 03:30:41 +0200
committerdec05eba <dec05eba@protonmail.com>2018-05-09 03:30:44 +0200
commitcd686f3f6099457a3115e758bf3da7e148ba432d (patch)
tree0f8212ef3d705bfc223990425389f8ad6a4ad733 /src/MessageBoard.cpp
parent161b5dbbf43d505b727e0ed3cae15458a72147f9 (diff)
Add avatar to users side panel
Diffstat (limited to 'src/MessageBoard.cpp')
-rw-r--r--src/MessageBoard.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/MessageBoard.cpp b/src/MessageBoard.cpp
index f2796e5..7df5018 100644
--- a/src/MessageBoard.cpp
+++ b/src/MessageBoard.cpp
@@ -122,6 +122,8 @@ namespace dchat
sf::RectangleShape lineRect(sf::Vector2f(backgroundSizeWithoutPadding.x - LINE_SIDE_PADDING * Settings::getScaling() * 2.0f, LINE_HEIGHT));
lineRect.setFillColor(ColorScheme::getBackgroundColor() + sf::Color(10, 10, 10));
+ sf::Shader *circleShader = ResourceCache::getShader("shaders/circleMask.glsl", sf::Shader::Fragment);
+
sf::Vector2<double> position(ChannelSidePanel::getWidth() + PADDING_SIDE * Settings::getScaling(), ChannelTopPanel::getHeight() + PADDING_TOP);
double startHeight = position.y;
position.y += scroll;
@@ -171,7 +173,6 @@ namespace dchat
const ContentByUrlResult avatarResult = cache.getContentByUrl(message->user->avatarUrl, 1024 * 1024);
if(avatarResult.type == ContentByUrlResult::Type::CACHED)
{
- sf::Shader *circleShader = ResourceCache::getShader("shaders/circleMask.glsl", sf::Shader::Fragment);
circleShader->setUniform("texture", sf::Shader::CurrentTexture);
if(avatarResult.cachedType == ContentByUrlResult::CachedType::TEXTURE)
@@ -366,7 +367,7 @@ namespace dchat
scroll += scrollSpeed;
- double deltaTimeScrollMultiplier = deltaTimeMicro * 0.00004;
+ double deltaTimeScrollMultiplier = deltaTimeMicro * 0.0001;
if(scrollSpeed > 0.0)
{
scrollSpeed -= deltaTimeScrollMultiplier;