rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweak some of the colors in the CSS rules for nheko.

Browse Source 
Add room list hover title/subtitle color change support.
This commit is contained in:
Joe Donofry 2019-01-12 14:35:56 +00:00
parent 6a90ed574e
commit ae91bab07d
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resources/styles/nheko.qss
View File

@ -10,8 +10,8 @@ QLabel {
#sideBar { #sideBar {
border: none; border: none;
border-right: 1px solid #dcdcdc; border-right: 1px solid #dee1f3;
border-left: 1px solid #dcdcdc; border-left: 1px solid #dee1f3;
} }
TimelineView, TimelineView,
@ -49,17 +49,17 @@ PopupItem {
RoomList, RoomList,
RoomList > * { RoomList > * {
background-color: white; background-color: #2e3649;
border: none; border: none;
} }
#roomlist_area { #roomlist_area {
background-color: white; background-color: #2e3649;
} }
CommunitiesList, CommunitiesList,
CommunitiesList > * { CommunitiesList > * {
background-color: white; background-color: #2e3649;
} }
FlatButton { FlatButton {
@ -85,7 +85,9 @@ RaisedButton {
RoomInfoListItem { RoomInfoListItem {
qproperty-highlightedBackgroundColor: #38A3D8; qproperty-highlightedBackgroundColor: #38A3D8;
qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70); qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70);
qproperty-backgroundColor: white; qproperty-hoverTitleColor: #f2f5f8;
qproperty-hoverSubtitleColor: white;
qproperty-backgroundColor: #f2f5f8;
qproperty-titleColor: #333; qproperty-titleColor: #333;
qproperty-subtitleColor: #5d6565; qproperty-subtitleColor: #5d6565;
@ -109,7 +111,7 @@ RoomInfoListItem {
CommunitiesListItem { CommunitiesListItem {
qproperty-highlightedBackgroundColor: #38A3D8; qproperty-highlightedBackgroundColor: #38A3D8;
qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70); qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70);
qproperty-backgroundColor: white; qproperty-backgroundColor: #f2f5f8;
qproperty-avatarBgColor: #eee; qproperty-avatarBgColor: #eee;
qproperty-avatarFgColor: black; qproperty-avatarFgColor: black;
@ -130,7 +132,7 @@ UserInfoWidget, UserInfoWidget > * {
UserInfoWidget { UserInfoWidget {
border: none; border: none;
border-bottom: 1px solid #dcdcdc; border-bottom: 2px solid #ccc;
} }
UserSettingsPage { UserSettingsPage {

4
src/RoomInfoListItem.cpp
View File

@ -158,8 +158,12 @@ RoomInfoListItem::paintEvent(QPaintEvent *event)
subtitlePen.setColor(highlightedSubtitleColor_); subtitlePen.setColor(highlightedSubtitleColor_);
} else if (underMouse()) { } else if (underMouse()) {
p.fillRect(rect(), hoverBackgroundColor_); p.fillRect(rect(), hoverBackgroundColor_);
titlePen.setColor(hoverTitleColor_);
subtitlePen.setColor(hoverSubtitleColor_);
} else { } else {
p.fillRect(rect(), backgroundColor_); p.fillRect(rect(), backgroundColor_);
titlePen.setColor(titleColor_);
subtitlePen.setColor(subtitleColor_);
} }
QRect avatarRegion(wm.padding, wm.padding, wm.iconSize, wm.iconSize); QRect avatarRegion(wm.padding, wm.padding, wm.iconSize, wm.iconSize);

12
src/RoomInfoListItem.h
View File

@ -55,6 +55,11 @@ class RoomInfoListItem : public QWidget
Q_PROPERTY(QColor highlightedSubtitleColor READ highlightedSubtitleColor WRITE Q_PROPERTY(QColor highlightedSubtitleColor READ highlightedSubtitleColor WRITE
setHighlightedSubtitleColor) setHighlightedSubtitleColor)
Q_PROPERTY(
QColor hoverTitleColor READ hoverTitleColor WRITE setHoverTitleColor)
Q_PROPERTY(QColor hoverSubtitleColor READ hoverSubtitleColor WRITE
setHoverSubtitleColor)
Q_PROPERTY(QColor btnColor READ btnColor WRITE setBtnColor) Q_PROPERTY(QColor btnColor READ btnColor WRITE setBtnColor)
Q_PROPERTY(QColor btnTextColor READ btnTextColor WRITE setBtnTextColor) Q_PROPERTY(QColor btnTextColor READ btnTextColor WRITE setBtnTextColor)
@ -74,6 +79,8 @@ public:
QColor highlightedBackgroundColor() const { return highlightedBackgroundColor_; } QColor highlightedBackgroundColor() const { return highlightedBackgroundColor_; }
QColor hoverBackgroundColor() const { return hoverBackgroundColor_; } QColor hoverBackgroundColor() const { return hoverBackgroundColor_; }
QColor hoverTitleColor() const { return hoverTitleColor_; }
QColor hoverSubtitleColor() const { return hoverSubtitleColor_; }
QColor backgroundColor() const { return backgroundColor_; } QColor backgroundColor() const { return backgroundColor_; }
QColor avatarBgColor() const { return avatarBgColor_; } QColor avatarBgColor() const { return avatarBgColor_; }
QColor avatarFgColor() const { return avatarFgColor_; } QColor avatarFgColor() const { return avatarFgColor_; }
@ -93,6 +100,8 @@ public:
void setHighlightedBackgroundColor(QColor &color) { highlightedBackgroundColor_ = color; } void setHighlightedBackgroundColor(QColor &color) { highlightedBackgroundColor_ = color; }
void setHoverBackgroundColor(QColor &color) { hoverBackgroundColor_ = color; } void setHoverBackgroundColor(QColor &color) { hoverBackgroundColor_ = color; }
void setHoverSubtitleColor(QColor &color) { hoverSubtitleColor_ = color; }
void setHoverTitleColor(QColor &color) { hoverTitleColor_ = color; }
void setBackgroundColor(QColor &color) { backgroundColor_ = color; } void setBackgroundColor(QColor &color) { backgroundColor_ = color; }
void setTimestampColor(QColor &color) { timestampColor_ = color; } void setTimestampColor(QColor &color) { timestampColor_ = color; }
void setAvatarFgColor(QColor &color) { avatarFgColor_ = color; } void setAvatarFgColor(QColor &color) { avatarFgColor_ = color; }
@ -186,6 +195,9 @@ private:
QColor titleColor_; QColor titleColor_;
QColor subtitleColor_; QColor subtitleColor_;
QColor hoverTitleColor_;
QColor hoverSubtitleColor_;
QColor btnColor_; QColor btnColor_;
QColor btnTextColor_; QColor btnTextColor_;