Proper handling of transparency.

diff --git a/examples/qml-compositor/qml/QmlCompositor/ShaderEffect.qml b/examples/qml-compositor/qml/QmlCompositor/ShaderEffect.qml
index 08a2178..2a2020f 100644 (file)
--- a/examples/qml-compositor/qml/QmlCompositor/ShaderEffect.qml
+++ b/examples/qml-compositor/qml/QmlCompositor/ShaderEffect.qml
@@ -53,7 +53,7 @@ ShaderEffectItem {
         vec4 sourceColor = texture2D(source, qt_TexCoord0);
         vec3 delta = sourceColor.rgb - vec3(0.5);
         vec3 lowerContrast = vec3(0.5) + 0.4 * delta;
-        gl_FragColor = qt_Opacity * vec4(color.rgb * dot(lowerContrast, vec3(11, 16, 5) * (1. /  32.)), sourceColor.a);
+        gl_FragColor = qt_Opacity * color * sourceColor.a * dot(lowerContrast, vec3(11, 16, 5) * (1. /  32.));
     }
     "
 }

diff --git a/examples/qml-compositor/qml/QmlCompositor/WindowChrome.qml b/examples/qml-compositor/qml/QmlCompositor/WindowChrome.qml
new file mode 100644 (file)
index 0000000..24a6bda
--- /dev/null
+++ b/examples/qml-compositor/qml/QmlCompositor/WindowChrome.qml
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** This file is part of QtCompositor**
+**
+** Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+**
+** Contact:  Nokia Corporation qt-info@nokia.com
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**
+** Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+**
+** Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in the
+** documentation and/or other materials provided with the distribution.
+**
+** Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the
+** names of its contributors may be used to endorse or promote products
+** derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Item {
+    id: chrome
+    anchors.fill: parent
+
+    property variant window: parent;
+
+    opacity: { if (parent.focus) 1.0; else 0.1; }
+
+    MouseArea {
+        anchors.fill: parent
+        enabled: !window.focus
+        onClicked: {
+            window.takeFocus();
+        }
+    }
+
+    Binding {
+        target: window
+        property: "opacity"
+        value: chrome.opacity
+    }
+
+    Behavior on opacity {
+        NumberAnimation {
+            easing.type: Easing.Linear;
+            duration: 200;
+        }
+    }
+}

diff --git a/examples/qml-compositor/qml/QmlCompositor/Window.qml b/examples/qml-compositor/qml/QmlCompositor/WindowContainer.qml
similarity index 90%
rename from examples/qml-compositor/qml/QmlCompositor/Window.qml
rename to examples/qml-compositor/qml/QmlCompositor/WindowContainer.qml
index 81cffcc..c2f9240 100644 (file)
--- a/examples/qml-compositor/qml/QmlCompositor/Window.qml
+++ b/examples/qml-compositor/qml/QmlCompositor/WindowContainer.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.0
 
-Rectangle {
+Item {
     id: container
 
     x: -400;
@@ -71,19 +71,10 @@ Rectangle {
         NumberAnimation { easing.type: Easing.Linear; duration: 250; }
     }
 
-    MouseArea {
-        anchors.fill: { if (child == null) parent; else child; }
-        z: 1
-        enabled: { if (child == null) true; else !child.focus; }
-        onClicked: {
-            child.takeFocus();
-        }
-    }
-
     ShaderEffect {
         source: child
         anchors.fill: child
-        opacity: { if (child && child.focus) 0.0; else 0.9; }
+        opacity: { if (child && child.focus) 0.0; else 0.8; }
         z: 1
 
         Behavior on opacity {

diff --git a/examples/qml-compositor/qml/QmlCompositor/main.qml b/examples/qml-compositor/qml/QmlCompositor/main.qml
index 3a3f9e5..faa9ef7 100644 (file)
--- a/examples/qml-compositor/qml/QmlCompositor/main.qml
+++ b/examples/qml-compositor/qml/QmlCompositor/main.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.0
 import "compositor.js" as CompositorLogic
 
-Rectangle {
+Item {
     id: root
 
     width: 1024
@@ -56,14 +56,17 @@ Rectangle {
     }
 
     function windowAdded(window) {
-        var windowComponent = Qt.createComponent("Window.qml");
-        var windowContainer = windowComponent.createObject(root);
+        var windowContainerComponent = Qt.createComponent("WindowContainer.qml");
+        var windowContainer = windowContainerComponent.createObject(root);
 
         window.parent = windowContainer;
         windowContainer.width = window.width;
         windowContainer.height = window.height;
         windowContainer.child = window;
 
+        var windowChromeComponent = Qt.createComponent("WindowChrome.qml");
+        var windowChrome = windowChromeComponent.createObject(window);
+
         CompositorLogic.addWindow(windowContainer);
 
         windowContainer.opacity = 1