From cf404f980d5b88091022e1c014e03092e73dc7c5 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Mon, 5 Jan 2015 21:47:42 +0100 Subject: [PATCH] Use already available shaderEffectSource and improve bloom look at low quality by limiting minimum radius. --- app/qml/TerminalContainer.qml | 7 +++++-- app/qml/frames/utils/TerminalFrame.qml | 2 +- app/qml/utils.js | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/qml/TerminalContainer.qml b/app/qml/TerminalContainer.qml index 0087c63..07facff 100644 --- a/app/qml/TerminalContainer.qml +++ b/app/qml/TerminalContainer.qml @@ -1,6 +1,8 @@ import QtQuick 2.2 import QtGraphicalEffects 1.0 +import "utils.js" as Utils + ShaderTerminal{ property alias title: terminal.title property alias terminalSize: terminal.terminalSize @@ -45,9 +47,10 @@ ShaderTerminal{ asynchronous: true width: parent.width * appSettings.bloomQuality height: parent.height * appSettings.bloomQuality + sourceComponent: FastBlur{ - radius: 48 * appSettings.bloomQuality * appSettings.windowScaling - source: terminal.mainTerminal + radius: Utils.lint(16, 48, appSettings.bloomQuality * appSettings.windowScaling); + source: terminal.mainSource transparentBorder: true } } diff --git a/app/qml/frames/utils/TerminalFrame.qml b/app/qml/frames/utils/TerminalFrame.qml index 1db72ca..093b2b5 100644 --- a/app/qml/frames/utils/TerminalFrame.qml +++ b/app/qml/frames/utils/TerminalFrame.qml @@ -83,7 +83,7 @@ Item{ sourceComponent: FastBlur{ id: frameReflectionEffect radius: 128 - source: terminal.kterminal + source: terminal.mainSource smooth: false } } diff --git a/app/qml/utils.js b/app/qml/utils.js index 889b022..b7daf2d 100644 --- a/app/qml/utils.js +++ b/app/qml/utils.js @@ -1,5 +1,8 @@ .pragma library +function lint(a, b, t) { + return (1 - t) * a + (t) * b; +} function mix(c1, c2, alpha){ return Qt.rgba(c1.r * alpha + c2.r * (1-alpha), c1.g * alpha + c2.g * (1-alpha),