aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.kdev4/dchat.kdev48
m---------depends/odhtdb0
-rw-r--r--src/ChannelTopPanel.cpp2
-rw-r--r--src/MessageBoard.cpp2
-rw-r--r--src/main.cpp1
5 files changed, 8 insertions, 5 deletions
diff --git a/.kdev4/dchat.kdev4 b/.kdev4/dchat.kdev4
index 78720b2..4d1ab04 100644
--- a/.kdev4/dchat.kdev4
+++ b/.kdev4/dchat.kdev4
@@ -11,11 +11,11 @@ parserArgumentsC=-ferror-limit=100 -fspell-checking -Wdocumentation -Wunused-par
Name=Clang
[CustomDefinesAndIncludes][ProjectPath0][Includes]
-1=/home/dec05eba/.sibs/lib/tiny-process/2.0.0
+1=/home/dec05eba/.cache/sibs/lib/tiny-process/2.0.0
2=/home/dec05eba/git/dchat/depends/odhtdb/include
-3=/home/dec05eba/.sibs/lib/sibs-serializer/0.2.0
-4=/home/dec05eba/.sibs/lib/ntpclient/0.2.0/include
-5=/home/dec05eba/.sibs/lib/fmt/4.1.0
+3=/home/dec05eba/.cache/sibs/lib/sibs-serializer/0.2.0
+4=/home/dec05eba/.cache/sibs/lib/ntpclient/0.2.1/include
+5=/home/dec05eba/.cache/sibs/lib/fmt/4.1.0
[Project]
VersionControlSupport=kdevgit
diff --git a/depends/odhtdb b/depends/odhtdb
-Subproject 483c2e1825971b28ff1b6a28c5c37c42ff2ab06
+Subproject 9519d5fc682f83b2a4d78fe8f66b169a8c9314e
diff --git a/src/ChannelTopPanel.cpp b/src/ChannelTopPanel.cpp
index 8d9b0c8..d597353 100644
--- a/src/ChannelTopPanel.cpp
+++ b/src/ChannelTopPanel.cpp
@@ -71,6 +71,6 @@ namespace dchat
float ChannelTopPanel::getHeight()
{
float fontSize = FONT_SIZE * Settings::getScaling();
- return floor(ResourceCache::getFont("fonts/Roboto-Regular.ttf")->getLineSpacing(fontSize) + PADDING_TOP + PADDING_BOTTOM);
+ return floor(ResourceCache::getFont("fonts/Roboto-Regular.ttf")->getLineSpacing(fontSize) + PADDING_TOP + PADDING_BOTTOM + BOTTOM_LINE_HEIGHT);
}
}
diff --git a/src/MessageBoard.cpp b/src/MessageBoard.cpp
index a2b9284..cd73c6d 100644
--- a/src/MessageBoard.cpp
+++ b/src/MessageBoard.cpp
@@ -184,6 +184,8 @@ namespace dchat
if(position.y + LINE_HEIGHT > 0.0f && position.y < backgroundPos.y + backgroundSize.y)
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;
}
totalHeight = (position.y - scroll) - startHeight;
}
diff --git a/src/main.cpp b/src/main.cpp
index dff2328..68f9ac0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -48,6 +48,7 @@ odhtdb::DatabaseNode createDatabaseNodeFromJoinKey(const string &joinKey)
void channelAddStoredMessages(Channel *channel, const odhtdb::DatabaseStorageObjectList *nodeStorage)
{
+ printf("Load %u messages in channel %s\n", nodeStorage->objects.size(), channel->getName().c_str());
for(auto nodeStorageAddedObject : nodeStorage->objects)
{
if(nodeStorageAddedObject->decryptedObject.operation == odhtdb::DatabaseOperation::ADD_DATA)