diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22673e669f5ed2341244b03399e8d04ac519e3ce..b513e297efe3314127ee328ea301900d64d52f2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,6 +170,7 @@ set(SRC_FILES
src/ui/Badge.cc
src/ui/LoadingIndicator.cc
src/ui/FlatButton.cc
+ src/ui/Label.cc
src/ui/OverlayModal.cc
src/ui/ScrollBar.cc
src/ui/SnackBar.cc
@@ -250,6 +251,7 @@ qt5_wrap_cpp(MOC_HEADERS
include/ui/Badge.h
include/ui/LoadingIndicator.h
include/ui/FlatButton.h
+ include/ui/Label.h
include/ui/OverlayWidget.h
include/ui/ScrollBar.h
include/ui/SnackBar.h
diff --git a/include/TopRoomBar.h b/include/TopRoomBar.h
index 870375740faa58235f0bd9d76b14723d8aa7210d..1b1d148c9708a8a69ec88d70433e6413c5f9f8a1 100644
--- a/include/TopRoomBar.h
+++ b/include/TopRoomBar.h
@@ -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();
}
diff --git a/include/ui/Label.h b/include/ui/Label.h
new file mode 100644
index 0000000000000000000000000000000000000000..66e98115b12478f172103ed34e95f115dbda44ba
--- /dev/null
+++ b/include/ui/Label.h
@@ -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_;
+};
diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc
index 8b2e338b3367a1fdfe14f7c90da39dddab5d8c7a..4d1f41955d612827e86ef6da53e6d08dbd73ca21 100644
--- a/src/TopRoomBar.cc
+++ b/src/TopRoomBar.cc
@@ -52,11 +52,15 @@ TopRoomBar::TopRoomBar(QWidget *parent)
QFont descriptionFont("Open Sans");
descriptionFont.setPixelSize(conf::topRoomBar::fonts::roomDescription);
- topicLabel_ = new QLabel(this);
+ topicLabel_ = new Label(this);
topicLabel_->setFont(descriptionFont);
topicLabel_->setTextFormat(Qt::RichText);
topicLabel_->setTextInteractionFlags(Qt::TextBrowserInteraction);
topicLabel_->setOpenExternalLinks(true);
+ connect(topicLabel_, &Label::clicked, [=](QMouseEvent *e) {
+ if (e->button() == Qt::LeftButton && !topicLabel_->hasSelectedText())
+ topicLabel_->setWordWrap(!topicLabel_->wordWrap());
+ });
textLayout_->addWidget(nameLabel_);
textLayout_->addWidget(topicLabel_);
@@ -164,15 +168,34 @@ TopRoomBar::paintEvent(QPaintEvent *event)
QPainter painter(this);
style()->drawPrimitive(QStyle::PE_Widget, &option, &painter, this);
+ // Number of pixels that we can move sidebar splitter per frame. If label contains text
+ // which fills entire it's width then label starts blocking it's layout from shrinking.
+ // Making label little bit shorter leaves some space for it to shrink.
+ const auto perFrameResize = 20;
+
QString elidedText =
- QFontMetrics(nameLabel_->font()).elidedText(roomName_, Qt::ElideRight, width());
+ QFontMetrics(nameLabel_->font())
+ .elidedText(roomName_, Qt::ElideRight, nameLabel_->width() - perFrameResize);
nameLabel_->setText(elidedText);
- elidedText =
- QFontMetrics(topicLabel_->font()).elidedText(roomTopic_, Qt::ElideRight, width());
+ if (topicLabel_->wordWrap())
+ elidedText = roomTopic_;
+ else
+ elidedText =
+ QFontMetrics(topicLabel_->font())
+ .elidedText(roomTopic_, Qt::ElideRight, topicLabel_->width() - perFrameResize);
+ elidedText.replace(URL_REGEX, URL_HTML);
topicLabel_->setText(elidedText);
}
+void
+TopRoomBar::mousePressEvent(QMouseEvent *event)
+{
+ if (childAt(event->pos()) == topicLabel_) {
+ event->accept();
+ }
+}
+
void
TopRoomBar::setRoomSettings(QSharedPointer<RoomSettings> settings)
{
diff --git a/src/ui/Label.cc b/src/ui/Label.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8bd8c54e502c8f850ee8cd7ef9099337c94502bb
--- /dev/null
+++ b/src/ui/Label.cc
@@ -0,0 +1,44 @@
+/*
+ * 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 "Label.h"
+#include <QMouseEvent>
+
+Label::Label(QWidget *parent, Qt::WindowFlags f)
+ : QLabel(parent, f)
+{}
+
+Label::Label(const QString &text, QWidget *parent, Qt::WindowFlags f)
+ : QLabel(text, parent, f)
+{}
+
+void
+Label::mousePressEvent(QMouseEvent *e)
+{
+ pressPosition_ = e->pos();
+ emit pressed(e);
+ QLabel::mousePressEvent(e);
+}
+
+void
+Label::mouseReleaseEvent(QMouseEvent *e)
+{
+ emit released(e);
+ if (pressPosition_ == e->pos())
+ emit clicked(e);
+ QLabel::mouseReleaseEvent(e);
+}