From f272d9221ea15bdc737f701f6d45434966e7a225 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sun, 7 Oct 2018 14:18:44 +0300 Subject: [PATCH] Use alignment instead of stretch --- CHANGELOG.md | 7 ++++--- src/CommunitiesList.cpp | 2 +- src/RoomList.cpp | 2 +- src/Utils.h | 2 +- 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