[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gcompris] src/activities/color_mix: color_mix, fix a Colorize item using a parent
From:       Bruno Coudoin <bruno.coudoin () gcompris ! net>
Date:       2015-11-30 20:20:58
Message-ID: E1a3UwU-0006SC-8C () scm ! kde ! org
[Download RAW message or body]

Git commit 11d7a37de42d6670c8afe06bbb61c1389784d4db by Bruno Coudoin.
Committed on 30/11/2015 at 20:20.
Pushed by bcoudoin into branch 'master'.

color_mix, fix a Colorize item using a parent

M  +10   -9    src/activities/color_mix/ColorChooser.qml

http://commits.kde.org/gcompris/11d7a37de42d6670c8afe06bbb61c1389784d4db

diff --git a/src/activities/color_mix/ColorChooser.qml b/src/activities/col=
or_mix/ColorChooser.qml
index 0f41696..68cd85d 100644
--- a/src/activities/color_mix/ColorChooser.qml
+++ b/src/activities/color_mix/ColorChooser.qml
@@ -84,16 +84,17 @@ Image {
             leftMargin: activity.modeRGB ? -20 * ApplicationInfo.ratio : 0
             verticalCenter: parent.verticalCenter
         }
+        visible: false
+        fillMode: Image.PreserveAspectFit        =

+    }
+
+    Colorize {
+        anchors.fill: intensityBrush
+        source: intensityBrush
+        hue: chooser.hue
+        lightness: 0
+        saturation: 1
         visible: currentStep > 0
-        fillMode: Image.PreserveAspectFit
-
-        Colorize {
-            anchors.fill: parent
-            source: parent
-            hue: chooser.hue
-            lightness: 0
-            saturation: 1
-        }
     }
 =

     ColorButton {
[prev in list] [next in list] [prev in thread] [next in thread]