d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable scrollbar on the room list for macOS (#174)

Browse source
This commit is contained in:
Konstantinos Sideris 2018-07-25 18:59:33 +03:00
parent 069f0a1fbd
commit 8386dd73ce
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/styles/nheko-dark.qss
View file

@ -45,6 +45,7 @@ PopupItem {
RoomList, RoomList,
RoomList > * { RoomList > * {
background-color: #2d3139; background-color: #2d3139;
border: none;
} }
CommunitiesList, CommunitiesList,

1
resources/styles/nheko.qss
View file

@ -45,6 +45,7 @@ PopupItem {
RoomList, RoomList,
RoomList > * { RoomList > * {
background-color: white; background-color: white;
border: none;
} }
CommunitiesList, CommunitiesList,

5
resources/styles/system.qss
View file

@ -70,6 +70,11 @@ RegisterPage {
background-color: palette(window); background-color: palette(window);
} }
RoomList,
RoomList > * {
border: none;
}
RoomInfoListItem { RoomInfoListItem {
qproperty-highlightedBackgroundColor: palette(highlight); qproperty-highlightedBackgroundColor: palette(highlight);
qproperty-hoverBackgroundColor: palette(light); qproperty-hoverBackgroundColor: palette(light);

8
src/RoomList.cpp
View file

@ -34,18 +34,22 @@ RoomList::RoomList(QSharedPointer<UserSettings> userSettings, QWidget *parent)
: QWidget(parent) : QWidget(parent)
, userSettings_{userSettings} , userSettings_{userSettings}
{ {
setStyleSheet("border: none;");
topLayout_ = new QVBoxLayout(this); topLayout_ = new QVBoxLayout(this);
topLayout_->setSpacing(0); topLayout_->setSpacing(0);
topLayout_->setMargin(0); topLayout_->setMargin(0);
scrollArea_ = new QScrollArea(this); scrollArea_ = new QScrollArea(this);
scrollArea_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); scrollArea_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
scrollArea_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
scrollArea_->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents); scrollArea_->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
scrollArea_->setWidgetResizable(true); scrollArea_->setWidgetResizable(true);
scrollArea_->setAlignment(Qt::AlignLeading | Qt::AlignTop | Qt::AlignVCenter); scrollArea_->setAlignment(Qt::AlignLeading | Qt::AlignTop | Qt::AlignVCenter);
// The scrollbar on macOS will hide itself when not active so it won't interfere
// with the content.
#if not defined(Q_OS_MAC)
scrollArea_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
#endif
scrollAreaContents_ = new QWidget(this); scrollAreaContents_ = new QWidget(this);
contentsLayout_ = new QVBoxLayout(scrollAreaContents_); contentsLayout_ = new QVBoxLayout(scrollAreaContents_);