aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-05-15 18:45:34 +0200
committerdec05eba <dec05eba@protonmail.com>2018-05-15 18:45:39 +0200
commit777d8053540cf94f5b2156c8e2b242efb4d07007 (patch)
tree2837ace9a921097090166ab812d50ce959a3bd53
parent67a34bbe01f1b271f37fb2b0cbe2c381357204ee (diff)
asdf
m---------depends/odhtdb0
-rw-r--r--src/Cache.cpp1
-rw-r--r--src/MessageBoard.cpp3
3 files changed, 2 insertions, 2 deletions
diff --git a/depends/odhtdb b/depends/odhtdb
-Subproject 95f683eae7a004860eae2bca43f56f98b769cf8
+Subproject d8e5c76c364450179f12fa985d50b7e4bfb5aa7
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;
}