From 25ed5db3248c82394606060c972b00bd48d1e3ff Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Sat, 7 Jun 2014 11:33:37 +0200 Subject: [PATCH] Fix input redirection --- app/Terminal.qml | 13 ++++++++++++- app/app.qmlproject.user | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/Terminal.qml b/app/Terminal.qml index fb6a7ad..6f3e25c 100644 --- a/app/Terminal.qml +++ b/app/Terminal.qml @@ -30,6 +30,8 @@ Item{ property variant bloomSource: bloomSourceLoader.item property variant scanlineSource: scanlineSourceLoader.item + property alias kterminal: kterminal + //The blur effect has to take into account the framerate property real fpsAttenuation: 60 / shadersettings.fps property real mBlur: shadersettings.motion_blur @@ -161,10 +163,19 @@ Item{ } } - function correctDistortion(x, y){ + //Frame displacement properties + property real dtop: frame.item.displacementTop + property real dleft:frame.item.displacementLeft + property real dright: frame.item.displacementRight + property real dbottom: frame.item.displacementBottom + + function correctDistortion(x, y){ x = x / width; y = y / height; + x = (-dleft + x * (width + dleft + dright)) / width + y = (-dtop + y * (height + dtop + dbottom)) / height + var cc = Qt.size(0.5 - x, 0.5 - y); var distortion = (cc.height * cc.height + cc.width * cc.width) * shadersettings.screen_distortion; diff --git a/app/app.qmlproject.user b/app/app.qmlproject.user index 8ca1b8a..1b7131c 100644 --- a/app/app.qmlproject.user +++ b/app/app.qmlproject.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget