adasauce
/
nheko
forked from mirror/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify room list item

Browse Source
remotes/origin/HEAD
Konstantinos Sideris 8 years ago
parent 6553aa61a1
commit f4522f9bbf
5 changed files with 245 additions and 124 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      CMakeLists.txt
  2. 46
      include/RoomInfoListItem.h
  3. 38
      include/Splitter.h
  4. 199
      src/RoomInfoListItem.cc
  5. 84
      src/Splitter.cc

2
CMakeLists.txt
Unescape View File

@ -97,6 +97,7 @@ set(SRC_FILES
src/Register.cc src/Register.cc
src/RegisterPage.cc src/RegisterPage.cc
src/SlidingStackWidget.cc src/SlidingStackWidget.cc
src/Splitter.cc
src/Sync.cc src/Sync.cc
src/TextInputWidget.cc src/TextInputWidget.cc
src/TopRoomBar.cc src/TopRoomBar.cc
@ -171,6 +172,7 @@ qt5_wrap_cpp(MOC_HEADERS
include/RegisterPage.h include/RegisterPage.h
include/RoomInfoListItem.h include/RoomInfoListItem.h
include/RoomList.h include/RoomList.h
include/Splitter.h
include/UserInfoWidget.h include/UserInfoWidget.h
include/SlidingStackWidget.h include/SlidingStackWidget.h
include/TopRoomBar.h include/TopRoomBar.h

46
include/RoomInfoListItem.h
Unescape View File

@ -17,13 +17,8 @@
#pragma once #pragma once
#include <QtWidgets/QHBoxLayout> #include <QWidget>
#include <QtWidgets/QLabel>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QWidget>
#include "Avatar.h"
#include "Badge.h"
#include "RippleOverlay.h" #include "RippleOverlay.h"
#include "RoomState.h" #include "RoomState.h"
@ -52,46 +47,37 @@ public slots:
protected: protected:
void mousePressEvent(QMouseEvent *event) override; void mousePressEvent(QMouseEvent *event) override;
void paintEvent(QPaintEvent *event) override;
private: private:
void setElidedText(QLabel *label, QString text, int width); const int Padding = 10;
const int IconSize = 45;
RippleOverlay *ripple_overlay_; RippleOverlay *ripple_overlay_;
RoomState state_; RoomState state_;
QString room_id_;
QHBoxLayout *topLayout_; QString roomId_;
QString roomName_;
QString lastMessage_;
QString lastTimestamp_;
QVBoxLayout *avatarLayout_; QPixmap roomAvatar_;
QVBoxLayout *textLayout_;
QWidget *avatarWidget_; bool isPressed_;
QWidget *textWidget_;
QLabel *roomName_; int maxHeight_ = 60;
QLabel *roomTopic_; int unreadMsgCount_ = 0;
Avatar *roomAvatar_;
Badge *unreadMessagesBadge_;
QString pressed_style_;
QString normal_style_;
bool is_pressed_;
int max_height_;
int unread_msg_count_;
}; };
inline int RoomInfoListItem::unreadMessageCount() const inline int RoomInfoListItem::unreadMessageCount() const
{ {
return unread_msg_count_; return unreadMsgCount_;
} }
inline bool RoomInfoListItem::isPressed() const inline bool RoomInfoListItem::isPressed() const
{ {
return is_pressed_; return isPressed_;
} }
inline RoomState RoomInfoListItem::state() const inline RoomState RoomInfoListItem::state() const
@ -99,7 +85,7 @@ inline RoomState RoomInfoListItem::state() const
return state_; return state_;
} }
inline void RoomInfoListItem::setAvatar(const QImage &avatar_image) inline void RoomInfoListItem::setAvatar(const QImage &img)
{ {
roomAvatar_->setImage(avatar_image); roomAvatar_ = QPixmap::fromImage(img.scaled(IconSize, IconSize, Qt::KeepAspectRatio, Qt::SmoothTransformation));
} }

38
include/Splitter.h
Unescape View File

@ -0,0 +1,38 @@
/*
* nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <QSplitter>
class Splitter : public QSplitter
{
Q_OBJECT
public:
explicit Splitter(int first_step, int second_step, QWidget *parent = nullptr);
private:
void onSplitterMoved(int pos, int index);
int firstStep_ = 60;
int secondStep_ = 300;
int moveEventLimit_ = 50;
int leftMoveCount_ = 0;
int rightMoveCount_ = 0;
};

199
src/RoomInfoListItem.cc
Unescape View File

@ -17,6 +17,7 @@
#include <QDebug> #include <QDebug>
#include <QMouseEvent> #include <QMouseEvent>
#include <QPainter>
#include "Ripple.h" #include "Ripple.h"
#include "RoomInfoListItem.h" #include "RoomInfoListItem.h"
@ -25,133 +26,150 @@
RoomInfoListItem::RoomInfoListItem(RoomState state, QString room_id, QWidget *parent) RoomInfoListItem::RoomInfoListItem(RoomState state, QString room_id, QWidget *parent)
: QWidget(parent) : QWidget(parent)
, state_(state) , state_(state)
, room_id_(room_id) , roomId_(room_id)
, is_pressed_(false) , isPressed_(false)
, max_height_(60) , maxHeight_(60)
, unread_msg_count_(0) , unreadMsgCount_(0)
{ {
normal_style_ = setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
"QWidget { color: black; background-color: #f8fbfe}"
"QLabel { border: none; }";
pressed_style_ = setFixedHeight(maxHeight_);
"QWidget { background-color: #acc7dc; color: black;}" setMaximumSize(parent->width(), maxHeight_);
"QLabel { border: none; }";
setStyleSheet(normal_style_); QPainterPath path;
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); path.addRect(0, 0, parent->width(), height());
setAutoFillBackground(true);
setMaximumSize(parent->width(), max_height_); ripple_overlay_ = new RippleOverlay(this);
ripple_overlay_->setClipPath(path);
ripple_overlay_->setClipping(true);
}
QString room_name = state_.resolveName(); void RoomInfoListItem::paintEvent(QPaintEvent *event)
QString room_topic = state_.topic.content().topic().simplified(); {
Q_UNUSED(event);
topLayout_ = new QHBoxLayout(this); QPainter p(this);
topLayout_->setSpacing(0); p.setRenderHint(QPainter::TextAntialiasing);
topLayout_->setMargin(0); p.setRenderHint(QPainter::SmoothPixmapTransform);
p.setRenderHint(QPainter::Antialiasing);
avatarWidget_ = new QWidget(this); if (isPressed_)
avatarWidget_->setMaximumSize(max_height_, max_height_); p.fillRect(rect(), QColor("#38A3D8"));
textWidget_ = new QWidget(this); else
p.fillRect(rect(), QColor("#F8FBFE"));
avatarLayout_ = new QVBoxLayout(avatarWidget_); QFont font("Open Sans", 10);
avatarLayout_->setSpacing(0);
avatarLayout_->setContentsMargins(0, 5, 0, 5);
textLayout_ = new QVBoxLayout(textWidget_); QFontMetrics metrics(font);
textLayout_->setSpacing(0); p.setFont(font);
textLayout_->setContentsMargins(0, 5, 0, 5);
roomAvatar_ = new Avatar(avatarWidget_); QRect avatarRegion(Padding, Padding, IconSize, IconSize);
roomAvatar_->setLetter(QChar(room_name[0]));
roomAvatar_->setSize(max_height_ - 20);
roomAvatar_->setTextColor("#555459");
roomAvatar_->setBackgroundColor("#d6dde3");
unreadMessagesBadge_ = new Badge(roomAvatar_); if (isPressed_) {
unreadMessagesBadge_->setRelativePosition(12, 10); QPen pen(QColor("white"));
unreadMessagesBadge_->setDiameter(5); p.setPen(pen);
unreadMessagesBadge_->setBackgroundColor("#f8fbfe"); }
unreadMessagesBadge_->setTextColor("black");
// TODO: Initialize when nheko can restore messages from previous session. auto name = metrics.elidedText(state_.resolveName(), Qt::ElideRight, (width() - IconSize - 2 * Padding) * 0.8);
unreadMessagesBadge_->hide(); p.drawText(QPoint(2 * Padding + IconSize, avatarRegion.center().y() - metrics.height() / 2), name);
avatarLayout_->addWidget(roomAvatar_); if (!isPressed_) {
QPen pen(QColor("#5d6565"));
p.setPen(pen);
}
roomName_ = new QLabel(room_name, textWidget_); int bottom_y = avatarRegion.center().y() + metrics.height() / 2 + Padding / 2;
roomName_->setMaximumSize(parent->width() - max_height_, 20); double descPercentage = 0.95;
roomName_->setFont(QFont("Open Sans", 11));
roomName_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
roomTopic_ = new QLabel(room_topic, textWidget_); if (unreadMsgCount_ > 0)
roomTopic_->setMaximumSize(parent->width() - max_height_, 20); descPercentage = 0.8;
roomTopic_->setFont(QFont("Open Sans", 10));
roomTopic_->setStyleSheet("color: #171919");
roomTopic_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
textLayout_->addWidget(roomName_); auto description = metrics.elidedText(state_.resolveTopic(), Qt::ElideRight, width() * descPercentage - 2 * Padding - IconSize);
textLayout_->addWidget(roomTopic_); p.drawText(QPoint(2 * Padding + IconSize, bottom_y), description);
topLayout_->addWidget(avatarWidget_); p.setPen(Qt::NoPen);
topLayout_->addWidget(textWidget_);
setElidedText(roomName_, room_name, parent->width() - max_height_); if (unreadMsgCount_ > 0) {
setElidedText(roomTopic_, room_topic, parent->width() - max_height_); QBrush brush;
brush.setStyle(Qt::SolidPattern);
brush.setColor(QColor("#38A3D8"));
QPainterPath path; p.setBrush(brush);
path.addRect(0, 0, parent->width(), max_height_); p.setPen(Qt::NoPen);
ripple_overlay_ = new RippleOverlay(this); QFont msgFont("Open Sans", 8);
ripple_overlay_->setClipPath(path); msgFont.setStyleName("Bold");
ripple_overlay_->setClipping(true);
setLayout(topLayout_); p.setFont(msgFont);
int diameter = 20;
QRectF r(width() - diameter - Padding, bottom_y - diameter / 2 - 5, diameter, diameter);
p.setPen(Qt::NoPen);
p.drawEllipse(r);
p.setPen(QPen(QColor("white")));
p.setBrush(Qt::NoBrush);
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)
{ {
unread_msg_count_ += count; unreadMsgCount_ += count;
unreadMessagesBadge_->setText(QString::number(unread_msg_count_)); repaint();
unreadMessagesBadge_->show();
} }
void RoomInfoListItem::clearUnreadMessageCount() void RoomInfoListItem::clearUnreadMessageCount()
{ {
unread_msg_count_ = 0; unreadMsgCount_ = 0;
unreadMessagesBadge_->setText(""); repaint();
unreadMessagesBadge_->hide();
} }
void RoomInfoListItem::setPressedState(bool state) void RoomInfoListItem::setPressedState(bool state)
{ {
if (!is_pressed_ && state) { if (!isPressed_ && state) {
is_pressed_ = state; isPressed_ = state;
setStyleSheet(pressed_style_); update();
} else if (is_pressed_ && !state) { } else if (isPressed_ && !state) {
is_pressed_ = state; isPressed_ = state;
setStyleSheet(normal_style_); update();
} }
} }
void RoomInfoListItem::setState(const RoomState &new_state) void RoomInfoListItem::setState(const RoomState &new_state)
{ {
if (state_.resolveName() != new_state.resolveName())
setElidedText(roomName_, new_state.resolveName(), parentWidget()->width() - max_height_);
if (state_.resolveTopic() != new_state.resolveTopic())
setElidedText(roomTopic_, new_state.resolveTopic(), parentWidget()->width() - max_height_);
if (new_state.avatar.content().url().toString().isEmpty())
roomAvatar_->setLetter(QChar(new_state.resolveName()[0]));
state_ = new_state; state_ = new_state;
repaint();
} }
void RoomInfoListItem::mousePressEvent(QMouseEvent *event) void RoomInfoListItem::mousePressEvent(QMouseEvent *event)
{ {
emit clicked(room_id_); emit clicked(roomId_);
setPressedState(true); setPressedState(true);
@ -163,20 +181,13 @@ void RoomInfoListItem::mousePressEvent(QMouseEvent *event)
ripple->setRadiusEndValue(radiusEndValue); ripple->setRadiusEndValue(radiusEndValue);
ripple->setOpacityStartValue(0.15); ripple->setOpacityStartValue(0.15);
ripple->setColor(QColor("#052B49")); ripple->setColor(QColor("white"));
ripple->radiusAnimation()->setDuration(300); ripple->radiusAnimation()->setDuration(200);
ripple->opacityAnimation()->setDuration(500); ripple->opacityAnimation()->setDuration(400);
ripple_overlay_->addRipple(ripple); ripple_overlay_->addRipple(ripple);
} }
void RoomInfoListItem::setElidedText(QLabel *label, QString text, int width)
{
QFontMetrics metrics(label->font());
QString elidedText = metrics.elidedText(text, Qt::ElideRight, width);
label->setText(elidedText);
}
RoomInfoListItem::~RoomInfoListItem() RoomInfoListItem::~RoomInfoListItem()
{ {
} }

84
src/Splitter.cc
Unescape View File

@ -0,0 +1,84 @@
/*
* nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QDebug>
#include "Splitter.h"
Splitter::Splitter(int first_step, int second_step, QWidget *parent)
: QSplitter(parent)
, firstStep_{first_step}
, secondStep_{second_step}
{
connect(this, &QSplitter::splitterMoved, this, &Splitter::onSplitterMoved);
}
void Splitter::onSplitterMoved(int pos, int index)
{
Q_UNUSED(pos);
Q_UNUSED(index);
auto s = sizes();
if (s.count() < 2) {
qWarning() << "Splitter needs at least two children";
return;
}
if (s[0] == secondStep_) {
rightMoveCount_ += 1;
if (rightMoveCount_ > moveEventLimit_) {
auto left = widget(0);
auto pos = left->mapFromGlobal(QCursor::pos());
// if we are coming from the right, the cursor should
// end up on the first widget.
if (left->rect().contains(pos)) {
qDebug() << "Resizing left";
left->setMinimumWidth(firstStep_);
left->setMaximumWidth(firstStep_);
rightMoveCount_ = 0;
}
}
} else if (s[0] == firstStep_) {
leftMoveCount_ += 1;
if (leftMoveCount_ > moveEventLimit_) {
auto left = widget(0);
auto right = widget(1);
auto pos = right->mapFromGlobal(QCursor::pos());
// We move the start a little further so the transition isn't so abrupt.
auto extended = right->rect();
extended.translate(100, 0);
// if we are coming from the left, the cursor should
// end up on the second widget.
if (extended.contains(pos)) {
qDebug() << "Resizing Right";
left->setMinimumWidth(secondStep_);
left->setMaximumWidth(2 * secondStep_);
leftMoveCount_ = 0;
}
}
}
}
Write Preview
Loading…
Cancel
Save