diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp index 262fb1cc..39b67f01 100644 --- a/YACReaderLibrary/grid_comics_view.cpp +++ b/YACReaderLibrary/grid_comics_view.cpp @@ -220,6 +220,7 @@ void GridComicsView::updateBackgroundConfig() // Use theme colors for cell and selected colors const auto &qv = theme.qmlView; + ctxt->setContextProperty("backgroundColor", useBackgroundImage ? qv.backgroundBlurOverlayColor : qv.backgroundColor); ctxt->setContextProperty("cellColor", useBackgroundImage ? qv.cellColorWithBackground : qv.cellColor); ctxt->setContextProperty("selectedColor", qv.selectedColor); } @@ -491,6 +492,7 @@ void GridComicsView::applyTheme(const Theme &theme) // Grid colors ctxt->setContextProperty("backgroundColor", qv.backgroundColor); + ctxt->setContextProperty("backgroundBlurOverlayColor", qv.backgroundBlurOverlayColor); ctxt->setContextProperty("cellColor", qv.cellColor); ctxt->setContextProperty("selectedColor", qv.selectedColor); ctxt->setContextProperty("selectedBorderColor", qv.selectedBorderColor); diff --git a/YACReaderLibrary/info_comics_view.cpp b/YACReaderLibrary/info_comics_view.cpp index ce442f1f..a93aeb16 100644 --- a/YACReaderLibrary/info_comics_view.cpp +++ b/YACReaderLibrary/info_comics_view.cpp @@ -243,4 +243,5 @@ void InfoComicsView::applyTheme(const Theme &theme) ctxt->setContextProperty("readTickCheckedColor", qv.readTickCheckedColor); ctxt->setContextProperty("showDropShadow", QVariant(qv.showDropShadow)); + ctxt->setContextProperty("backgroundBlurOverlayColor", qv.backgroundBlurOverlayColor); } diff --git a/YACReaderLibrary/qml/FlowView.qml b/YACReaderLibrary/qml/FlowView.qml index b2796158..6ebc35a7 100644 --- a/YACReaderLibrary/qml/FlowView.qml +++ b/YACReaderLibrary/qml/FlowView.qml @@ -25,7 +25,7 @@ Rectangle { Rectangle { id: background - color: "#2A2A2A" + color: backgroundBlurOverlayColor anchors.fill: backgroundImg } diff --git a/YACReaderLibrary/themes/theme.h b/YACReaderLibrary/themes/theme.h index 55771d83..0d98c0ad 100644 --- a/YACReaderLibrary/themes/theme.h +++ b/YACReaderLibrary/themes/theme.h @@ -241,6 +241,9 @@ struct QmlViewTheme { // Continue reading section (FolderContentView) QColor continueReadingBackgroundColor; QColor continueReadingColor; + + // Blur overlay background (FlowView always, GridView when background image enabled) + QColor backgroundBlurOverlayColor; }; struct MainToolbarThemeTemplates { diff --git a/YACReaderLibrary/themes/theme_factory.cpp b/YACReaderLibrary/themes/theme_factory.cpp index 99009d75..b9e103e2 100644 --- a/YACReaderLibrary/themes/theme_factory.cpp +++ b/YACReaderLibrary/themes/theme_factory.cpp @@ -170,6 +170,9 @@ struct QmlViewParams { // Continue reading section (FolderContentView) QColor continueReadingBackgroundColor; QColor continueReadingColor; + + // Blur overlay background (FlowView always, GridView when background image enabled) + QColor backgroundBlurOverlayColor; }; struct MainToolbarParams { @@ -514,6 +517,7 @@ Theme makeTheme(const ThemeParams ¶ms) theme.qmlView.currentComicBackgroundColor = qv.currentComicBackgroundColor; theme.qmlView.continueReadingBackgroundColor = qv.continueReadingBackgroundColor; theme.qmlView.continueReadingColor = qv.continueReadingColor; + theme.qmlView.backgroundBlurOverlayColor = qv.backgroundBlurOverlayColor; // end QmlView // MainToolbar @@ -1036,6 +1040,7 @@ ThemeParams classicThemeParams() qv.currentComicBackgroundColor = QColor(0x00, 0x00, 0x00, 0x88); qv.continueReadingBackgroundColor = QColor(0x00, 0x00, 0x00, 0x88); qv.continueReadingColor = QColor(0xFFFFFF); + qv.backgroundBlurOverlayColor = QColor(0x2A2A2A); params.qmlViewParams = qv; MainToolbarParams mt; @@ -1307,6 +1312,7 @@ ThemeParams lightThemeParams() qv.currentComicBackgroundColor = QColor(0xFF, 0xFF, 0xFF, 0x88); qv.continueReadingBackgroundColor = QColor(0xE8E8E8); qv.continueReadingColor = QColor::fromRgb(0x000000); + qv.backgroundBlurOverlayColor = QColor(0x9E9E9E); params.qmlViewParams = qv; MainToolbarParams mt; @@ -1578,6 +1584,7 @@ ThemeParams darkThemeParams() qv.currentComicBackgroundColor = QColor(0x00, 0x00, 0x00, 0x88); qv.continueReadingBackgroundColor = QColor(0x00, 0x00, 0x00, 0x88); qv.continueReadingColor = QColor(0xFFFFFF); + qv.backgroundBlurOverlayColor = QColor(0x2A2A2A); params.qmlViewParams = qv; MainToolbarParams mt;