From 777d8053540cf94f5b2156c8e2b242efb4d07007 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 15 May 2018 18:45:34 +0200 Subject: asdf --- depends/odhtdb | 2 +- src/Cache.cpp | 1 + src/MessageBoard.cpp | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/depends/odhtdb b/depends/odhtdb index 95f683e..d8e5c76 160000 --- a/depends/odhtdb +++ b/depends/odhtdb @@ -1 +1 @@ -Subproject commit 95f683eae7a004860eae2bca43f56f98b769cf80 +Subproject commit d8e5c76c364450179f12fa985d50b7e4bfb5aa78 diff --git a/src/Cache.cpp b/src/Cache.cpp index 16cd4d0..66b6f71 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -288,6 +288,7 @@ namespace dchat boost::filesystem::remove(downloadingFilepath, err); } + // TODO: Do not load content in this thread. Return LOADING status and load it in another thread, because with a lot of images, chat can freeze ContentByUrlResult contentByUrlResult = loadImageFromFile(filepath); if(contentByUrlResult.type == ContentByUrlResult::Type::CACHED) { diff --git a/src/MessageBoard.cpp b/src/MessageBoard.cpp index 7df5018..46b9d28 100644 --- a/src/MessageBoard.cpp +++ b/src/MessageBoard.cpp @@ -221,9 +221,8 @@ namespace dchat window.draw(lineRect); //drawGradientLine(sf::Vector2f(position.x + LINE_SIDE_PADDING, floor(position.y)), sf::Vector2f(backgroundSizeWithoutPadding.x - LINE_SIDE_PADDING * 2.0f, LINE_HEIGHT), LINE_COLOR, window); } - - position.y += LINE_HEIGHT; } + position.y += LINE_HEIGHT; } totalHeight = (position.y - scroll) - startHeight; } -- cgit v1.2.3