Skip to content
Snippets Groups Projects
Commit 3fceaeb2 authored by Joe Donofry's avatar Joe Donofry
Browse files

Add hover color for timestamp.

Update dark and system themes to provide
colors for the hover states for title, subtitle, and timestamp.
parent ae91bab0
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -100,6 +100,7 @@ RoomInfoListItem {
qproperty-timestampColor: #707070;
qproperty-highlightedTimestampColor: #f4f4f5;
qproperty-hoverTimestampColor: white;
qproperty-avatarBgColor: #eee;
qproperty-avatarFgColor: black;
......
......@@ -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);
......
......@@ -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),
......
......@@ -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_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment