Make sidebar topic expand on click and fix html formatting of elided text. (#96)

Fixes #95
This commit is contained in:
Rokas Kupstys 2017-10-20 20:58:23 +03:00 committed by mujx
parent 8299a74775
commit 3205e5fdd3
5 changed files with 102 additions and 6 deletions

View file

@ -29,6 +29,7 @@
#include "Avatar.h"
#include "FlatButton.h"
#include "Label.h"
#include "LeaveRoomDialog.h"
#include "Menu.h"
#include "OverlayModal.h"
@ -58,6 +59,7 @@ signals:
protected:
void paintEvent(QPaintEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
private slots:
void closeLeaveRoomDialog(bool leaving);
@ -67,7 +69,7 @@ private:
QVBoxLayout *textLayout_;
QLabel *nameLabel_;
QLabel *topicLabel_;
Label *topicLabel_;
QSharedPointer<RoomSettings> roomSettings_;
@ -112,7 +114,6 @@ TopRoomBar::updateRoomName(const QString &name)
inline void
TopRoomBar::updateRoomTopic(QString topic)
{
topic.replace(URL_REGEX, URL_HTML);
roomTopic_ = topic;
update();
}

26
include/ui/Label.h Normal file
View file

@ -0,0 +1,26 @@
#pragma once
#include <QLabel>
class Label : public QLabel
{
Q_OBJECT
public:
explicit Label(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
explicit Label(const QString &text,
QWidget *parent = Q_NULLPTR,
Qt::WindowFlags f = Qt::WindowFlags());
~Label() override {}
signals:
void clicked(QMouseEvent *e);
void pressed(QMouseEvent *e);
void released(QMouseEvent *e);
protected:
void mousePressEvent(QMouseEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
QPoint pressPosition_;
};