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

Snappy sidebar

Browse source
This commit is contained in:
Konstantinos Sideris 2017-05-19 19:55:38 +03:00
parent 30fce32161
commit c480f8f4bc
11 changed files with 174 additions and 238 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -149,8 +149,6 @@ include_directories(include/ui)
include_directories(include/events) include_directories(include/events)
include_directories(include/events/messages) include_directories(include/events/messages)
qt5_wrap_ui (UI_HEADERS forms/ChatPage.ui)
qt5_wrap_cpp(MOC_HEADERS qt5_wrap_cpp(MOC_HEADERS
include/ChatPage.h include/ChatPage.h
include/EmojiCategory.h include/EmojiCategory.h

153
forms/ChatPage.ui
View file

@ -1,153 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ChatPage</class>
<widget class="QWidget" name="ChatPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>798</width>
<height>519</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<property name="styleSheet">
<string notr="true">background-color: #f8fbfe;
</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="sideBarLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="sideBarWidget" native="true">
<property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="sideBarTopLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="sideBarTopWidget" native="true">
<property name="styleSheet">
<string notr="true">background-color: #d6dde3;
color: #ebebeb;</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="spacing">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="sideBarTopUserInfoLayout">
<property name="spacing">
<number>0</number>
</property>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="sideBarMainLayout">
<property name="spacing">
<number>0</number>
</property>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="contentLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="topBarLayout">
<property name="spacing">
<number>0</number>
</property>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="mainContentLayout">
<property name="spacing">
<number>0</number>
</property>
</layout>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
<resources>
<include location="../resources/res.qrc"/>
</resources>
<connections/>
</ui>

21
include/ChatPage.h
View file

@ -24,16 +24,12 @@
#include "MatrixClient.h" #include "MatrixClient.h"
#include "RoomList.h" #include "RoomList.h"
#include "RoomState.h" #include "RoomState.h"
#include "Splitter.h"
#include "TextInputWidget.h" #include "TextInputWidget.h"
#include "TimelineViewManager.h" #include "TimelineViewManager.h"
#include "TopRoomBar.h" #include "TopRoomBar.h"
#include "UserInfoWidget.h" #include "UserInfoWidget.h"
namespace Ui
{
class ChatPage;
}
class ChatPage : public QWidget class ChatPage : public QWidget
{ {
Q_OBJECT Q_OBJECT
@ -64,7 +60,20 @@ private slots:
private: private:
void updateRoomState(RoomState &room_state, const QJsonArray &events); void updateRoomState(RoomState &room_state, const QJsonArray &events);
Ui::ChatPage *ui; QHBoxLayout *topLayout_;
Splitter *splitter;
QWidget *sideBar_;
QVBoxLayout *sideBarLayout_;
QVBoxLayout *sideBarTopLayout_;
QVBoxLayout *sideBarMainLayout_;
QWidget *sideBarTopWidget_;
QVBoxLayout *sideBarTopWidgetLayout_;
QWidget *content_;
QVBoxLayout *contentLayout_;
QHBoxLayout *topBarLayout_;
QVBoxLayout *mainContentLayout_;
RoomList *room_list_; RoomList *room_list_;
TimelineViewManager *view_manager_; TimelineViewManager *view_manager_;

5
include/Splitter.h
View file

@ -23,14 +23,11 @@ class Splitter : public QSplitter
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit Splitter(int first_step, int second_step, QWidget *parent = nullptr); explicit Splitter(QWidget *parent = nullptr);
private: private:
void onSplitterMoved(int pos, int index); void onSplitterMoved(int pos, int index);
int firstStep_ = 60;
int secondStep_ = 300;
int moveEventLimit_ = 50; int moveEventLimit_ = 50;
int leftMoveCount_ = 0; int leftMoveCount_ = 0;

3
include/UserInfoWidget.h
View file

@ -42,6 +42,9 @@ public:
signals: signals:
void logout(); void logout();
protected:
void resizeEvent(QResizeEvent *event) override;
private: private:
Avatar *userAvatar_; Avatar *userAvatar_;

5
include/ui/Theme.h
View file

@ -12,6 +12,11 @@ enum class AvatarType {
Letter Letter
}; };
namespace sidebar
{
static const int SmallSize = 60;
static const int NormalSize = 300;
}
// Default font size. // Default font size.
const int FontSize = 16; const int FontSize = 16;

76
src/ChatPage.cc
View file

@ -15,14 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "ui_ChatPage.h"
#include <QDebug> #include <QDebug>
#include <QLabel>
#include <QSettings> #include <QSettings>
#include "ChatPage.h" #include "ChatPage.h"
#include "Splitter.h"
#include "Sync.h" #include "Sync.h"
#include "Theme.h"
#include "TimelineViewManager.h" #include "TimelineViewManager.h"
#include "UserInfoWidget.h" #include "UserInfoWidget.h"
@ -43,26 +42,80 @@ namespace events = matrix::events;
ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent) ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
: QWidget(parent) : QWidget(parent)
, ui(new Ui::ChatPage)
, sync_interval_(2000) , sync_interval_(2000)
, client_(client) , client_(client)
{ {
ui->setupUi(this); resize(798, 519);
setStyleSheet("background-color: #f8fbfe;");
topLayout_ = new QHBoxLayout(this);
topLayout_->setSpacing(0);
topLayout_->setMargin(0);
auto splitter = new Splitter(this);
splitter->setHandleWidth(0);
topLayout_->addWidget(splitter);
// SideBar
sideBar_ = new QWidget(this);
sideBar_->setMinimumSize(QSize(ui::sidebar::NormalSize, 0));
sideBarLayout_ = new QVBoxLayout(sideBar_);
sideBarLayout_->setSpacing(0);
sideBarLayout_->setMargin(0);
sideBarTopLayout_ = new QVBoxLayout();
sideBarTopLayout_->setSpacing(0);
sideBarTopLayout_->setMargin(0);
sideBarMainLayout_ = new QVBoxLayout();
sideBarMainLayout_->setSpacing(0);
sideBarMainLayout_->setMargin(0);
sideBarLayout_->addLayout(sideBarTopLayout_);
sideBarLayout_->addLayout(sideBarMainLayout_);
sideBarTopWidget_ = new QWidget(sideBar_);
sideBarTopWidget_->setStyleSheet("background-color: #d6dde3; color: #ebebeb;");
sideBarTopLayout_->addWidget(sideBarTopWidget_);
sideBarTopWidgetLayout_ = new QVBoxLayout(sideBarTopWidget_);
sideBarTopWidgetLayout_->setSpacing(0);
sideBarTopWidgetLayout_->setMargin(0);
// Content
content_ = new QWidget(this);
contentLayout_ = new QVBoxLayout(content_);
contentLayout_->setSpacing(0);
contentLayout_->setMargin(0);
topBarLayout_ = new QHBoxLayout();
topBarLayout_->setSpacing(0);
mainContentLayout_ = new QVBoxLayout();
mainContentLayout_->setSpacing(0);
mainContentLayout_->setMargin(0);
contentLayout_->addLayout(topBarLayout_);
contentLayout_->addLayout(mainContentLayout_);
// Splitter
splitter->addWidget(sideBar_);
splitter->addWidget(content_);
room_list_ = new RoomList(client, this); room_list_ = new RoomList(client, this);
ui->sideBarMainLayout->addWidget(room_list_); sideBarMainLayout_->addWidget(room_list_);
top_bar_ = new TopRoomBar(this); top_bar_ = new TopRoomBar(this);
ui->topBarLayout->addWidget(top_bar_); topBarLayout_->addWidget(top_bar_);
view_manager_ = new TimelineViewManager(client, this); view_manager_ = new TimelineViewManager(client, this);
ui->mainContentLayout->addWidget(view_manager_); mainContentLayout_->addWidget(view_manager_);
text_input_ = new TextInputWidget(this); text_input_ = new TextInputWidget(this);
ui->contentLayout->addWidget(text_input_); contentLayout_->addWidget(text_input_);
user_info_widget_ = new UserInfoWidget(ui->sideBarTopWidget); user_info_widget_ = new UserInfoWidget(sideBarTopWidget_);
ui->sideBarTopUserInfoLayout->addWidget(user_info_widget_); sideBarTopWidgetLayout_->addWidget(user_info_widget_);
sync_timer_ = new QTimer(this); sync_timer_ = new QTimer(this);
sync_timer_->setSingleShot(true); sync_timer_->setSingleShot(true);
@ -366,5 +419,4 @@ void ChatPage::updateRoomState(RoomState &room_state, const QJsonArray &events)
ChatPage::~ChatPage() ChatPage::~ChatPage()
{ {
sync_timer_->stop(); sync_timer_->stop();
delete ui;
} }

61
src/RoomInfoListItem.cc
View file

@ -22,6 +22,7 @@
#include "Ripple.h" #include "Ripple.h"
#include "RoomInfoListItem.h" #include "RoomInfoListItem.h"
#include "RoomState.h" #include "RoomState.h"
#include "Theme.h"
RoomInfoListItem::RoomInfoListItem(RoomState state, QString room_id, QWidget *parent) RoomInfoListItem::RoomInfoListItem(RoomState state, QString room_id, QWidget *parent)
: QWidget(parent) : QWidget(parent)
@ -36,7 +37,6 @@ RoomInfoListItem::RoomInfoListItem(RoomState state, QString room_id, QWidget *pa
setAttribute(Qt::WA_Hover); setAttribute(Qt::WA_Hover);
setFixedHeight(maxHeight_); setFixedHeight(maxHeight_);
setMaximumSize(parent->width(), maxHeight_);
QPainterPath path; QPainterPath path;
path.addRect(0, 0, parent->width(), height()); path.addRect(0, 0, parent->width(), height());
@ -69,6 +69,10 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event)
QRect avatarRegion(Padding, Padding, IconSize, IconSize); QRect avatarRegion(Padding, Padding, IconSize, IconSize);
// Description line
int bottom_y = avatarRegion.center().y() + metrics.height() / 2 + Padding / 2;
if (width() > ui::sidebar::SmallSize) {
if (isPressed_) { if (isPressed_) {
QPen pen(QColor("white")); QPen pen(QColor("white"));
p.setPen(pen); p.setPen(pen);
@ -82,7 +86,6 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event)
p.setPen(pen); p.setPen(pen);
} }
int bottom_y = avatarRegion.center().y() + metrics.height() / 2 + Padding / 2;
double descPercentage = 0.95; double descPercentage = 0.95;
if (unreadMsgCount_ > 0) if (unreadMsgCount_ > 0)
@ -90,9 +93,37 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event)
auto description = metrics.elidedText(state_.resolveTopic(), Qt::ElideRight, width() * descPercentage - 2 * Padding - IconSize); auto description = metrics.elidedText(state_.resolveTopic(), Qt::ElideRight, width() * descPercentage - 2 * Padding - IconSize);
p.drawText(QPoint(2 * Padding + IconSize, bottom_y), description); p.drawText(QPoint(2 * Padding + IconSize, bottom_y), description);
}
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
// We using the first letter of room's name.
if (roomAvatar_.isNull()) {
QBrush brush;
brush.setStyle(Qt::SolidPattern);
brush.setColor("#eee");
p.setPen(Qt::NoPen);
p.setBrush(brush);
p.drawEllipse(avatarRegion.center(), IconSize / 2, IconSize / 2);
font.setPixelSize(13);
p.setFont(font);
p.setPen(QColor("#333"));
p.setBrush(Qt::NoBrush);
p.drawText(avatarRegion.translated(0, -1), Qt::AlignCenter, QChar(state_.resolveName()[0]));
} else {
p.save();
QPainterPath path;
path.addEllipse(Padding, Padding, IconSize, IconSize);
p.setClipPath(path);
p.drawPixmap(avatarRegion, roomAvatar_);
p.restore();
}
if (unreadMsgCount_ > 0) { if (unreadMsgCount_ > 0) {
QColor textColor("white"); QColor textColor("white");
QColor backgroundColor("#38A3D8"); QColor backgroundColor("#38A3D8");
@ -116,6 +147,9 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event)
QRectF r(width() - diameter - Padding, bottom_y - diameter / 2 - 5, diameter, diameter); QRectF r(width() - diameter - Padding, bottom_y - diameter / 2 - 5, diameter, diameter);
if (width() == ui::sidebar::SmallSize)
r = QRectF(width() - diameter - 5, height() - diameter - 5, diameter, diameter);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
p.drawEllipse(r); p.drawEllipse(r);
@ -127,29 +161,6 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event)
p.setBrush(Qt::NoBrush); p.setBrush(Qt::NoBrush);
p.drawText(r.translated(0, -0.5), Qt::AlignCenter, QString::number(unreadMsgCount_)); p.drawText(r.translated(0, -0.5), Qt::AlignCenter, QString::number(unreadMsgCount_));
} }
// We using the first letter of room's name.
if (roomAvatar_.isNull()) {
QBrush brush;
brush.setStyle(Qt::SolidPattern);
brush.setColor("#eee");
p.setPen(Qt::NoPen);
p.setBrush(brush);
p.drawEllipse(avatarRegion.center(), IconSize / 2, IconSize / 2);
font.setPixelSize(13);
p.setFont(font);
p.setPen(QColor("#333"));
p.setBrush(Qt::NoBrush);
p.drawText(avatarRegion.translated(0, -1), Qt::AlignCenter, QChar(state_.resolveName()[0]));
} else {
QPainterPath path;
path.addEllipse(Padding, Padding, IconSize, IconSize);
p.setClipPath(path);
p.drawPixmap(avatarRegion, roomAvatar_);
}
} }
void RoomInfoListItem::updateUnreadMessageCount(int count) void RoomInfoListItem::updateUnreadMessageCount(int count)

4
src/RoomList.cc
View file

@ -31,13 +31,11 @@ RoomList::RoomList(QSharedPointer<MatrixClient> client, QWidget *parent)
"QWidget { border: none; }" "QWidget { border: none; }"
"QScrollBar:vertical { width: 4px; margin: 2px 0; }"); "QScrollBar:vertical { width: 4px; margin: 2px 0; }");
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
sizePolicy.setHorizontalStretch(0); sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0); sizePolicy.setVerticalStretch(0);
setSizePolicy(sizePolicy); setSizePolicy(sizePolicy);
setMinimumSize(QSize(0, 500));
topLayout_ = new QVBoxLayout(this); topLayout_ = new QVBoxLayout(this);
topLayout_->setSpacing(0); topLayout_->setSpacing(0);
topLayout_->setMargin(0); topLayout_->setMargin(0);

21
src/Splitter.cc
View file

@ -18,11 +18,10 @@
#include <QDebug> #include <QDebug>
#include "Splitter.h" #include "Splitter.h"
#include "Theme.h"
Splitter::Splitter(int first_step, int second_step, QWidget *parent) Splitter::Splitter(QWidget *parent)
: QSplitter(parent) : QSplitter(parent)
, firstStep_{first_step}
, secondStep_{second_step}
{ {
connect(this, &QSplitter::splitterMoved, this, &Splitter::onSplitterMoved); connect(this, &QSplitter::splitterMoved, this, &Splitter::onSplitterMoved);
} }
@ -39,7 +38,7 @@ void Splitter::onSplitterMoved(int pos, int index)
return; return;
} }
if (s[0] == secondStep_) { if (s[0] == ui::sidebar::NormalSize) {
rightMoveCount_ += 1; rightMoveCount_ += 1;
if (rightMoveCount_ > moveEventLimit_) { if (rightMoveCount_ > moveEventLimit_) {
@ -49,15 +48,13 @@ void Splitter::onSplitterMoved(int pos, int index)
// if we are coming from the right, the cursor should // if we are coming from the right, the cursor should
// end up on the first widget. // end up on the first widget.
if (left->rect().contains(pos)) { if (left->rect().contains(pos)) {
qDebug() << "Resizing left"; left->setMinimumWidth(ui::sidebar::SmallSize);
left->setMaximumWidth(ui::sidebar::SmallSize);
left->setMinimumWidth(firstStep_);
left->setMaximumWidth(firstStep_);
rightMoveCount_ = 0; rightMoveCount_ = 0;
} }
} }
} else if (s[0] == firstStep_) { } else if (s[0] == ui::sidebar::SmallSize) {
leftMoveCount_ += 1; leftMoveCount_ += 1;
if (leftMoveCount_ > moveEventLimit_) { if (leftMoveCount_ > moveEventLimit_) {
@ -72,10 +69,8 @@ void Splitter::onSplitterMoved(int pos, int index)
// if we are coming from the left, the cursor should // if we are coming from the left, the cursor should
// end up on the second widget. // end up on the second widget.
if (extended.contains(pos)) { if (extended.contains(pos)) {
qDebug() << "Resizing Right"; left->setMinimumWidth(ui::sidebar::NormalSize);
left->setMaximumWidth(2 * ui::sidebar::NormalSize);
left->setMinimumWidth(secondStep_);
left->setMaximumWidth(2 * secondStep_);
leftMoveCount_ = 0; leftMoveCount_ = 0;
} }

27
src/UserInfoWidget.cc
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "UserInfoWidget.h" #include <QDebug>
#include "FlatButton.h" #include "FlatButton.h"
#include "UserInfoWidget.h"
UserInfoWidget::UserInfoWidget(QWidget *parent) UserInfoWidget::UserInfoWidget(QWidget *parent)
: QWidget(parent) : QWidget(parent)
@ -29,7 +31,7 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
topLayout_ = new QHBoxLayout(this); topLayout_ = new QHBoxLayout(this);
topLayout_->setSpacing(0); topLayout_->setSpacing(0);
topLayout_->setContentsMargins(5, 5, 5, 5); topLayout_->setMargin(5);
avatarLayout_ = new QHBoxLayout(); avatarLayout_ = new QHBoxLayout();
textLayout_ = new QVBoxLayout(); textLayout_ = new QVBoxLayout();
@ -65,11 +67,12 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
topLayout_->addStretch(1); topLayout_->addStretch(1);
buttonLayout_ = new QHBoxLayout(); buttonLayout_ = new QHBoxLayout();
buttonLayout_->setSpacing(0);
buttonLayout_->setMargin(0);
logoutButton_ = new FlatButton(this); logoutButton_ = new FlatButton(this);
logoutButton_->setForegroundColor(QColor("#555459")); logoutButton_->setForegroundColor(QColor("#555459"));
logoutButton_->setCursor(QCursor(Qt::PointingHandCursor)); logoutButton_->setCursor(QCursor(Qt::PointingHandCursor));
logoutButton_->setStyleSheet("width: 30px; height: 30px;");
QIcon icon; QIcon icon;
icon.addFile(":/icons/icons/power-button-off.png", QSize(), QIcon::Normal, QIcon::Off); icon.addFile(":/icons/icons/power-button-off.png", QSize(), QIcon::Normal, QIcon::Off);
@ -88,6 +91,24 @@ UserInfoWidget::~UserInfoWidget()
{ {
} }
void UserInfoWidget::resizeEvent(QResizeEvent *event)
{
Q_UNUSED(event);
if (width() <= ui::sidebar::SmallSize) {
topLayout_->setContentsMargins(0, 0, 10, 0);
userAvatar_->hide();
displayNameLabel_->hide();
userIdLabel_->hide();
} else {
topLayout_->setMargin(5);
userAvatar_->show();
displayNameLabel_->show();
userIdLabel_->show();
}
}
void UserInfoWidget::reset() void UserInfoWidget::reset()
{ {
displayNameLabel_->setText(""); displayNameLabel_->setText("");