summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-10-07 14:18:44 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-10-07 14:18:44 +0300
commitf272d9221ea15bdc737f701f6d45434966e7a225 (patch)
treecfcfc5ff7eb2cb9ed8de9782dd4dd7a6ea6672ad
parentaa486a5c0ca9b5e886fedd3b12acf0e5238f2ce7 (diff)
Use alignment instead of stretchnightly
-rw-r--r--CHANGELOG.md7
-rw-r--r--src/CommunitiesList.cpp2
-rw-r--r--src/RoomList.cpp2
-rw-r--r--src/Utils.h2
4 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d58d047..12cbbf44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,9 +12,10 @@
- Don't enable tray by default.
- Hard-coded pixel values were removed. The sizes are derived from the font.
-### Removed
-- Remove room re-ordering option.
-- Built-in emoji picker & emoji font.
+### Other changes
+- Removed room re-ordering option.
+- Removed built-in emoji picker.
+- Removed bundled fonts.
## [0.6.1] - 2018-09-26
diff --git a/src/CommunitiesList.cpp b/src/CommunitiesList.cpp
index 60bb0eb5..6e46741b 100644
--- a/src/CommunitiesList.cpp
+++ b/src/CommunitiesList.cpp
@@ -1,5 +1,5 @@
-#include "Cache.h"
#include "CommunitiesList.h"
+#include "Cache.h"
#include "Logging.h"
#include "MatrixClient.h"
#include "Utils.h"
diff --git a/src/RoomList.cpp b/src/RoomList.cpp
index a2d28c13..c1b080c0 100644
--- a/src/RoomList.cpp
+++ b/src/RoomList.cpp
@@ -53,9 +53,9 @@ RoomList::RoomList(QWidget *parent)
scrollAreaContents_->setObjectName("roomlist_area");
contentsLayout_ = new QVBoxLayout(scrollAreaContents_);
+ contentsLayout_->setAlignment(Qt::AlignTop);
contentsLayout_->setSpacing(0);
contentsLayout_->setMargin(0);
- contentsLayout_->addStretch(1);
scrollArea_->setWidget(scrollAreaContents_);
topLayout_->addWidget(scrollArea_);
diff --git a/src/Utils.h b/src/Utils.h
index c0a78177..2a029943 100644
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -239,7 +239,7 @@ struct SideBarSizes
int small;
int normal;
int groups;
- int collapsePoint;
+ int collapsePoint;
};
SideBarSizes