diff options
Diffstat (limited to 'src/MessageBoard.cpp')
| -rw-r--r-- | src/MessageBoard.cpp | 5 |
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; |