Use alignment instead of stretch

mujx · Oct 7, 2018 · f272d92 · f272d92
1 parent aa486a5
commit f272d92
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -239,7 +239,7 @@ struct SideBarSizes
         int small;
         int normal;
         int groups;
-	int collapsePoint;
+        int collapsePoint;
 };
 
 SideBarSizes