thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move timestamps to the right

Browse source
This commit is contained in:
Konstantinos Sideris 2018-01-14 12:29:54 +02:00
parent fe9d8a6534
commit dfeb0c833a
3 changed files with 78 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Config.h
View file

@ -83,7 +83,7 @@ static constexpr int headerSpacing = 7;
static constexpr int headerLeftMargin = 15;
namespace fonts {
static constexpr int timestamp = 10;
static constexpr int timestamp = 13;
static constexpr int dateSeparator = conf::fontSize - 2;
} // namespace fonts
} // namespace timeline

33
include/timeline/TimelineItem.h
View file

@ -122,10 +122,14 @@ private:
QAction *showReadReceipts_;
QHBoxLayout *topLayout_;
QVBoxLayout *sideLayout_; // Avatar or Timestamp
QVBoxLayout *mainLayout_; // Header & Message body
//! The message and the timestamp/checkmark.
QHBoxLayout *messageLayout_;
//! Avatar or Timestamp
QVBoxLayout *sideLayout_;
//! Header & Message body
QVBoxLayout *mainLayout_;
QHBoxLayout *headerLayout_; // Username (&) Timestamp
QVBoxLayout *headerLayout_; // Username (&) Timestamp
Avatar *userAvatar_;
@ -159,17 +163,25 @@ TimelineItem::setupLocalWidgetLayout(Widget *widget,
widgetLayout->addWidget(widget);
widgetLayout->addStretch(1);
messageLayout_->setContentsMargins(0, 0, 20, 4);
messageLayout_->setSpacing(20);
if (withSender) {
generateBody(displayName, "");
setupAvatarLayout(displayName);
mainLayout_->addLayout(headerLayout_);
headerLayout_->addLayout(widgetLayout);
messageLayout_->addLayout(headerLayout_, 1);
AvatarProvider::resolve(userid, [=](const QImage &img) { setUserAvatar(img); });
} else {
setupSimpleLayout();
messageLayout_->addLayout(widgetLayout, 1);
}
mainLayout_->addLayout(widgetLayout);
messageLayout_->addWidget(timestamp_);
mainLayout_->addLayout(messageLayout_);
}
template<class Event, class Widget>
@ -201,16 +213,23 @@ TimelineItem::setupWidgetLayout(Widget *widget,
widgetLayout->addWidget(widget);
widgetLayout->addStretch(1);
messageLayout_->setContentsMargins(0, 0, 20, 4);
messageLayout_->setSpacing(20);
if (withSender) {
generateBody(displayName, "");
setupAvatarLayout(displayName);
mainLayout_->addLayout(headerLayout_);
headerLayout_->addLayout(widgetLayout);
messageLayout_->addLayout(headerLayout_, 1);
AvatarProvider::resolve(sender, [=](const QImage &img) { setUserAvatar(img); });
} else {
setupSimpleLayout();
messageLayout_->addLayout(widgetLayout, 1);
}
mainLayout_->addLayout(widgetLayout);
messageLayout_->addWidget(timestamp_);
mainLayout_->addLayout(messageLayout_);
}