From ac0aa6ded5d8eb91321a708ea6cc9f16a016df67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Thu, 13 Sep 2018 09:46:15 +0200 Subject: [PATCH] Use theme as the color source for the completed decoration. --- YACReaderLibrary/theme.h | 9 +++++++-- YACReaderLibrary/yacreader_folders_view.cpp | 10 +++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/YACReaderLibrary/theme.h b/YACReaderLibrary/theme.h index 483a9d45..d6d49360 100644 --- a/YACReaderLibrary/theme.h +++ b/YACReaderLibrary/theme.h @@ -38,7 +38,6 @@ public: "QListView::item:selected {background-color: #EFEFEF; color:#CCCCCC;}" "QListView::item:hover {background-color:#F4F4F8; color:#757575; }" - "QScrollBar:vertical { border-radius:3px; background: #FFFFFF; width: 14px; margin: 0 10px 0 0; }" "QScrollBar::handle:vertical { border: 1px solid #999999; background: #999999; width: 14px; min-height: 20px; border-radius: 2px; }" "QScrollBar::add-line:vertical { border: none; background: #999999; height: 0px; subcontrol-position: bottom; subcontrol-origin: margin; margin: 0 3px 0 0;}" @@ -56,6 +55,8 @@ public: t.titledToolBarSeparatorColor = "#AFAFAF"; t.titledToolBarTitleColor = "#808080"; t.titledToolBarTitleShadowColor = "#00000000"; + + t.foldersViewCompletedColor = "#AABFFF"; } else { t.isMacosNative = false; #ifdef Q_OS_MAC @@ -81,7 +82,6 @@ public: "QListView::item:selected {background-color: #212121; color:#CCCCCC;}" "QListView::item:hover {background-color:#212121; color:#CCCCCC; }" - "QScrollBar:vertical { border: none; background: #212121; width: 14px; margin: 0 10px 0 0; }" "QScrollBar::handle:vertical { background: #858585; width: 14px; min-height: 20px; }" "QScrollBar::add-line:vertical { border: none; background: #212121; height: 0px; subcontrol-position: bottom; subcontrol-origin: margin; margin: 0 3px 0 0;}" @@ -102,6 +102,8 @@ public: t.titledToolBarSeparatorColor = "#6F6F6F"; t.titledToolBarTitleColor = "#BDBFBF"; t.titledToolBarTitleShadowColor = "#000000"; + + t.foldersViewCompletedColor = "#EDC542"; } return t; @@ -139,6 +141,9 @@ public: QString titledToolBarSeparatorColor; QString titledToolBarTitleColor; QString titledToolBarTitleShadowColor; + + //YACReaderFoldersView (tree view) + QString foldersViewCompletedColor; }; #endif // THEME_H diff --git a/YACReaderLibrary/yacreader_folders_view.cpp b/YACReaderLibrary/yacreader_folders_view.cpp index b36fd9b4..de6260f2 100644 --- a/YACReaderLibrary/yacreader_folders_view.cpp +++ b/YACReaderLibrary/yacreader_folders_view.cpp @@ -6,6 +6,8 @@ #include "comic.h" #include "comic_files_manager.h" +#include "theme.h" + #include "QsLog.h" YACReaderFoldersView::YACReaderFoldersView(QWidget *parent) @@ -80,11 +82,9 @@ void YACReaderFoldersViewItemDeletegate::paint(QPainter *painter, const QStyleOp { if (!index.data(FolderModel::CompletedRole).toBool()) { painter->save(); -#ifdef Q_OS_MAC - painter->setBrush(QBrush(QColor(85, 95, 127))); -#else - painter->setBrush(QBrush(QColor(237, 197, 24))); -#endif + + painter->setBrush(QBrush(QColor(Theme::currentTheme().foldersViewCompletedColor))); + painter->setPen(QPen(QBrush(), 0)); painter->drawRect(0, option.rect.y(), 2, option.rect.height()); painter->restore();