diff --git a/YACReaderLibrary/qml/FlowView6.qml b/YACReaderLibrary/qml/FlowView6.qml index 3e96df8c..75da010a 100644 --- a/YACReaderLibrary/qml/FlowView6.qml +++ b/YACReaderLibrary/qml/FlowView6.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls -import Qt5Compat.GraphicalEffects +import QtQuick.Effects import com.yacreader.ComicModel 1.0 @@ -39,14 +39,16 @@ Rectangle { mipmap: true asynchronous : true cache: false //TODO clear cache only when it is needed - opacity: 0 + layer.enabled: true visible: false } - FastBlur { + MultiEffect { anchors.fill: backgroundImg source: backgroundImg - radius: backgroundBlurRadius + blurEnabled: true + blur: 1.0 + blurMax: 64 opacity: backgroundBlurOpacity visible: backgroundBlurVisible } diff --git a/YACReaderLibrary/qml/FolderContentView6.qml b/YACReaderLibrary/qml/FolderContentView6.qml index 6b27c713..015eeb14 100644 --- a/YACReaderLibrary/qml/FolderContentView6.qml +++ b/YACReaderLibrary/qml/FolderContentView6.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import Qt5Compat.GraphicalEffects +import QtQuick.Effects import com.yacreader.ComicModel 1.0 @@ -119,18 +119,31 @@ Rectangle { mipmap: true asynchronous : true cache: true + visible: false + } + Item { + id: coverMask + anchors.fill: parent layer.enabled: true - layer.effect: OpacityMask { + layer.smooth: true + visible: false + + Rectangle { anchors.fill: parent - cached: true - maskSource: Rectangle { - width: coverElement.width - height: coverElement.height - radius: 10 - } + radius: 10 + color: "black" } } + + MultiEffect { + source: coverImage + anchors.fill: coverImage + maskEnabled: true + maskSource: coverMask + maskThresholdMin: 0.5 + maskSpreadAtMin: 1.0 + } } //is new diff --git a/YACReaderLibrary/qml/GridComicsView6.qml b/YACReaderLibrary/qml/GridComicsView6.qml index 9e0ff61b..47c94926 100644 --- a/YACReaderLibrary/qml/GridComicsView6.qml +++ b/YACReaderLibrary/qml/GridComicsView6.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import Qt5Compat.GraphicalEffects +import QtQuick.Effects import com.yacreader.ComicModel 1.0 @@ -33,14 +33,16 @@ SplitView { mipmap: true asynchronous : true cache: false //TODO clear cache only when it is needed - opacity: 0 + layer.enabled: true visible: false } - FastBlur { + MultiEffect { anchors.fill: backgroundImg source: backgroundImg - radius: backgroundBlurRadius + blurEnabled: true + blur: 1.0 + blurMax: 64 opacity: backgroundBlurOpacity visible: backgroundBlurVisible } @@ -472,18 +474,16 @@ SplitView { mipmap: true asynchronous : true cache: false //TODO clear cache only when it is needed - } - DropShadow { - anchors.fill: currentCoverElement - horizontalOffset: 0 - verticalOffset: 0 - radius: 8.0 - transparentBorder: true - //samples: 17 - color: "#FF000000" - source: currentCoverElement - visible: showDropShadow; + layer.enabled: showDropShadow + layer.effect: MultiEffect { + shadowEnabled: true + shadowColor: "#FF000000" + shadowBlur: 1.0 + blurMax: 8 + shadowHorizontalOffset: 0 + shadowVerticalOffset: 0 + } } ColumnLayout @@ -685,19 +685,16 @@ SplitView { color: "white" text: readButton.text } - } - - DropShadow { - anchors.fill: readButton - transparentBorder: true - horizontalOffset: 0 - verticalOffset: 0 - radius: 8.0 - //samples: 17 - color: "#AA000000" - source: readButton - visible: showDropShadow && !readButton.pressed + layer.enabled: showDropShadow && !readButton.pressed + layer.effect: MultiEffect { + shadowEnabled: true + shadowColor: "#AA000000" + shadowBlur: 1.0 + blurMax: 8 + shadowHorizontalOffset: 0 + shadowVerticalOffset: 0 + } } } }