diff --git a/qml/cool-old-term/TerminalFrame.qml b/qml/cool-old-term/TerminalFrame.qml index 326e179..c2fedf4 100644 --- a/qml/cool-old-term/TerminalFrame.qml +++ b/qml/cool-old-term/TerminalFrame.qml @@ -10,7 +10,7 @@ Item{ property int borderBottom property string imageSource property string normalsSource - property Component shader + property rect sourceRect property string shaderString BorderImage{ diff --git a/qml/cool-old-term/main.qml b/qml/cool-old-term/main.qml index 3735936..1798e87 100644 --- a/qml/cool-old-term/main.qml +++ b/qml/cool-old-term/main.qml @@ -70,7 +70,7 @@ ApplicationWindow{ ShaderEffectSource{ id: theSource sourceItem: terminal - sourceRect: Qt.rect(-65, -75, terminal.width + 130, terminal.height + 150) + sourceRect: frame.sourceRect } ShaderEffect { @@ -190,18 +190,36 @@ ApplicationWindow{ }" } +// TerminalFrame{ +// id: frame +// z: 2.1 +// anchors.fill: parent +// addedWidth: 140 +// addedHeight: 140 +// borderLeft: 116 +// borderRight: 116 +// borderTop: 116 +// borderBottom: 116 +// imageSource: "../images/screen-frame.png" +// normalsSource: "../images/screen-frame-normals.png" +// sourceRect: Qt.rect(-65, -75, terminal.width + 130, terminal.height + 150) + +// shaderString: "WhiteFrameShader.qml" +// } + TerminalFrame{ id: frame z: 2.1 anchors.fill: parent - addedWidth: 140 - addedHeight: 140 - borderLeft: 116 - borderRight: 116 - borderTop: 116 - borderBottom: 116 - imageSource: "../images/screen-frame.png" - normalsSource: "../images/screen-frame-normals.png" + addedWidth: 200 + addedHeight: 370 + borderLeft: 148 + borderRight: 148 + borderTop: 232 + borderBottom: 232 + imageSource: "../images/black-frame.png" + normalsSource: "../images/black-frame-normals.png" + sourceRect: Qt.rect(-80, -90, terminal.width + 160, terminal.height + 180 ) shaderString: "WhiteFrameShader.qml" } diff --git a/qml/images/black-frame-normals.png b/qml/images/black-frame-normals.png new file mode 100644 index 0000000..f033e46 Binary files /dev/null and b/qml/images/black-frame-normals.png differ diff --git a/qml/images/black-frame.png b/qml/images/black-frame.png new file mode 100644 index 0000000..04ef702 Binary files /dev/null and b/qml/images/black-frame.png differ