d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-10-30 09:30:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add hover color for timestamp.

Browse source 
Update dark and system themes to provide
colors for the hover states for title, subtitle, and timestamp.
This commit is contained in:
redsky17 2019-01-12 22:03:25 +00:00
parent ae91bab07d
commit 3fceaeb203
5 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/styles/nheko-dark.qss
View file

@ -93,6 +93,9 @@ RoomInfoListItem {
qproperty-titleColor: #e4e5e8;
qproperty-subtitleColor: #caccd1;
qproperty-hoverTitleColor: #f4f5f8;
qproperty-hoverSubtitleColor: white;
qproperty-highlightedTitleColor: #f4f4f5;
qproperty-highlightedSubtitleColor: #e4e5e8;
@ -101,6 +104,7 @@ RoomInfoListItem {
qproperty-timestampColor: #727274;
qproperty-highlightedTimestampColor: #e7e7e9;
qproperty-hoverTimestampColor: #f4f5f8;
qproperty-avatarBgColor: #202228;
qproperty-avatarFgColor: white;

1
resources/styles/nheko.qss
View file

@ -100,6 +100,7 @@ RoomInfoListItem {
qproperty-timestampColor: #707070;
qproperty-highlightedTimestampColor: #f4f4f5;
qproperty-hoverTimestampColor: white;
qproperty-avatarBgColor: #eee;
qproperty-avatarFgColor: black;

4
resources/styles/system.qss
View file

@ -92,11 +92,15 @@ RoomInfoListItem {
qproperty-highlightedTitleColor: palette(highlightedtext);
qproperty-highlightedSubtitleColor: palette(highlightedtext);
qproperty-hoverTitleColor: palette(highlightedtext);
qproperty-hoverSubtitleColor: palette(highlightedtext);
qproperty-btnColor: palette(button);
qproperty-btnTextColor: palette(buttonText);
qproperty-timestampColor: palette(text);
qproperty-highlightedTimestampColor: palette(highlightedtext);
qproperty-hoverTimestampColor: palette(highlightedtext);
qproperty-avatarBgColor: palette(base);
qproperty-avatarFgColor: palette(text);

7
src/RoomInfoListItem.cpp
View file

@ -227,10 +227,13 @@ RoomInfoListItem::paintEvent(QPaintEvent *event)
// We show the last message timestamp.
p.save();
if (isPressed_)
if (isPressed_) {
p.setPen(QPen(highlightedTimestampColor_));
else
} else if (underMouse()) {
p.setPen(QPen(hoverTimestampColor_));
} else {
p.setPen(QPen(timestampColor_));
}
p.setFont(tsFont);
p.drawText(QPoint(width() - wm.padding - msgStampWidth, top_y),

5
src/RoomInfoListItem.h
View file

@ -49,6 +49,8 @@ class RoomInfoListItem : public QWidget
Q_PROPERTY(QColor timestampColor READ timestampColor WRITE setTimestampColor)
Q_PROPERTY(QColor highlightedTimestampColor READ highlightedTimestampColor WRITE
setHighlightedTimestampColor)
Q_PROPERTY(QColor hoverTimestampColor READ hoverTimestampColor WRITE
setHoverTimestampColor)
Q_PROPERTY(
QColor highlightedTitleColor READ highlightedTitleColor WRITE setHighlightedTitleColor)
@ -81,6 +83,7 @@ public:
QColor hoverBackgroundColor() const { return hoverBackgroundColor_; }
QColor hoverTitleColor() const { return hoverTitleColor_; }
QColor hoverSubtitleColor() const { return hoverSubtitleColor_; }
QColor hoverTimestampColor() const { return hoverTimestampColor_; }
QColor backgroundColor() const { return backgroundColor_; }
QColor avatarBgColor() const { return avatarBgColor_; }
QColor avatarFgColor() const { return avatarFgColor_; }
@ -102,6 +105,7 @@ public:
void setHoverBackgroundColor(QColor &color) { hoverBackgroundColor_ = color; }
void setHoverSubtitleColor(QColor &color) { hoverSubtitleColor_ = color; }
void setHoverTitleColor(QColor &color) { hoverTitleColor_ = color; }
void setHoverTimestampColor(QColor &color) { hoverTimestampColor_ = color; }
void setBackgroundColor(QColor &color) { backgroundColor_ = color; }
void setTimestampColor(QColor &color) { timestampColor_ = color; }
void setAvatarFgColor(QColor &color) { avatarFgColor_ = color; }
@ -210,6 +214,7 @@ private:
QColor timestampColor_;
QColor highlightedTimestampColor_;
QColor hoverTimestampColor_;
QColor avatarBgColor_;
QColor avatarFgColor_;