From ccff6a3ab626b2ed6f67372a680a79f71733a6e1 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Sat, 15 May 2021 22:17:28 +0300 Subject: [PATCH] [app] Use HarbourPressEffect --- app/app.pro | 3 ++- app/qml/BooksShelfItem.qml | 20 ++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/app/app.pro b/app/app.pro index aeb0e46..76e841e 100644 --- a/app/app.pro +++ b/app/app.pro @@ -203,7 +203,8 @@ SOURCES += \ HARBOUR_QML_COMPONENTS = \ $$HARBOUR_LIB_QML/HarbourFitLabel.qml \ $$HARBOUR_LIB_QML/HarbourHighlightIcon.qml \ - $$HARBOUR_LIB_QML/HarbourHorizontalSwipeHint.qml + $$HARBOUR_LIB_QML/HarbourHorizontalSwipeHint.qml \ + $$HARBOUR_LIB_QML/HarbourPressEffect.qml OTHER_FILES += $${HARBOUR_QML_COMPONENTS} diff --git a/app/qml/BooksShelfItem.qml b/app/qml/BooksShelfItem.qml index d706ad3..7dc4489 100644 --- a/app/qml/BooksShelfItem.qml +++ b/app/qml/BooksShelfItem.qml @@ -1,6 +1,6 @@ /* - Copyright (C) 2015-2019 Jolla Ltd. - Copyright (C) 2015-2019 Slava Monich + Copyright (C) 2015-2021 Jolla Ltd. + Copyright (C) 2015-2021 Slava Monich You may use this file under the terms of the BSD license as follows: @@ -34,6 +34,8 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import harbour.books 1.0 +import "harbour" + Item { id: root @@ -115,18 +117,8 @@ Item { } layer.enabled: root.pressed - layer.effect: ShaderEffect { // i.e. PressEffect from Lipstick - property variant source - property color color: Theme.rgba(Theme.highlightBackgroundColor, 0.4) - fragmentShader: " - uniform sampler2D source; - uniform highp vec4 color; - uniform lowp float qt_Opacity; - varying highp vec2 qt_TexCoord0; - void main(void) { - highp vec4 pixelColor = texture2D(source, qt_TexCoord0); - gl_FragColor = vec4(mix(pixelColor.rgb/max(pixelColor.a, 0.00390625), color.rgb/max(color.a, 0.00390625), color.a) * pixelColor.a, pixelColor.a) * qt_Opacity; - }" + layer.effect: HarbourPressEffect { + source: cover } }