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

Add borders

Browse source
This commit is contained in:
Konstantinos Sideris 2018-01-15 21:04:49 +02:00
parent 020a842aef
commit af5663b6bc
6 changed files with 71 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/SideBarActions.h
View file

@ -28,6 +28,7 @@ signals:
protected: protected:
void resizeEvent(QResizeEvent *event) override; void resizeEvent(QResizeEvent *event) override;
void paintEvent(QPaintEvent *event) override;
private: private:
QHBoxLayout *layout_; QHBoxLayout *layout_;

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

@ -7,6 +7,11 @@ QLabel {
background-color: #383c4a; background-color: #383c4a;
} }
#sideBar {
border: none;
border-right: 1px solid #414A59;
}
TimelineView, TimelineView,
TimelineView > * { TimelineView > * {
background-color: #383c4a; background-color: #383c4a;
@ -73,6 +78,11 @@ UserInfoWidget, UserInfoWidget > * {
color: #b0b3ba; color: #b0b3ba;
} }
UserInfoWidget {
border: none;
border-bottom: 1px solid #414A59;
}
UserSettingsPage { UserSettingsPage {
background-color: #383c4a; background-color: #383c4a;
} }
@ -142,3 +152,13 @@ ScrollBar {
qproperty-handleColor: #caccd1; qproperty-handleColor: #caccd1;
qproperty-backgroundColor: #383c4e; qproperty-backgroundColor: #383c4e;
} }
SideBarActions {
border: none;
border-top: 1px solid #414A59;
}
TopRoomBar {
border: none;
border-bottom: 1px solid #414A59;
}

20
resources/styles/nheko.qss
View file

@ -7,6 +7,11 @@ QLabel {
background-color: white; background-color: white;
} }
#sideBar {
border: none;
border-right: 1px solid #dcdcdc;
}
TimelineView, TimelineView,
TimelineView > * { TimelineView > * {
background-color: white; background-color: white;
@ -76,6 +81,11 @@ UserInfoWidget, UserInfoWidget > * {
color: #ebebeb; color: #ebebeb;
} }
UserInfoWidget {
border: none;
border-bottom: 1px solid #dcdcdc;
}
UserSettingsPage { UserSettingsPage {
background-color: white; background-color: white;
} }
@ -139,3 +149,13 @@ ScrollBar {
qproperty-handleColor: #ccc; qproperty-handleColor: #ccc;
qproperty-backgroundColor: #efefef; qproperty-backgroundColor: #efefef;
} }
SideBarActions {
border: none;
border-top: 1px solid #dcdcdc;
}
TopRoomBar {
border: none;
border-bottom: 1px solid #dcdcdc;
}

20
resources/styles/system.qss
View file

@ -8,6 +8,11 @@ OverlayWidget > * {
background-color: palette(window); background-color: palette(window);
} }
#sideBar {
border: none;
border-right: 1px solid palette(text);
}
TimelineView, TimelineView,
TimelineView > *, TimelineView > *,
TimelineItem, TimelineItem,
@ -79,6 +84,11 @@ UserInfoWidget > * {
background-color: palette(window); background-color: palette(window);
} }
UserInfoWidget {
border: none;
border-bottom: 1px solid palette(text);
}
emoji--Category, emoji--Category,
emoji--Category > * { emoji--Category > * {
background-color: palette(window); background-color: palette(window);
@ -108,3 +118,13 @@ QListWidget {
background-color: palette(window); background-color: palette(window);
color: palette(text); color: palette(text);
} }
SideBarActions {
border: none;
border-top: 1px solid palette(text);
}
TopRoomBar {
border: none;
border-bottom: 1px solid palette(text);
}

1
src/ChatPage.cc
View file

@ -78,6 +78,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
// SideBar // SideBar
sideBar_ = new QFrame(this); sideBar_ = new QFrame(this);
sideBar_->setObjectName("sideBar");
sideBar_->setMinimumWidth(ui::sidebar::NormalSize); sideBar_->setMinimumWidth(ui::sidebar::NormalSize);
sideBarLayout_ = new QVBoxLayout(sideBar_); sideBarLayout_ = new QVBoxLayout(sideBar_);
sideBarLayout_->setSpacing(0); sideBarLayout_->setSpacing(0);

9
src/SideBarActions.cc
View file

@ -131,3 +131,12 @@ SideBarActions::resizeEvent(QResizeEvent *event)
createRoomBtn_->show(); createRoomBtn_->show();
} }
} }
void
SideBarActions::paintEvent(QPaintEvent *)
{
QStyleOption opt;
opt.init(this);
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}