Sync with upstream breeze

2 files changed, 58 insertions, 4 deletions

diff --git a/components/VirtualKeyboard.qml b/components/VirtualKeyboard.qml
index 7848b75..edc7ab4 100644
--- a/components/VirtualKeyboard.qml
+++ b/components/VirtualKeyboard.qml
@@ -18,11 +18,65 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 import QtQuick 2.5
 import QtQuick.VirtualKeyboard 2.1
+import org.kde.plasma.core 2.0 as PlasmaCore
 
 InputPanel {
     id: inputPanel
     property bool activated: false
     active: activated && Qt.inputMethod.visible
-    visible: active
     width: parent.width
+
+    states: [
+        State {
+            name: "visible"
+            when: inputPanel.active
+            PropertyChanges {
+                target: inputPanel
+                y: inputPanel.parent.height - inputPanel.height
+                opacity: 1
+                visible: true
+            }
+        },
+        State {
+            name: "hidden"
+            when: !inputPanel.active
+            PropertyChanges {
+                target: inputPanel
+                y: inputPanel.parent.height
+                opacity: 0
+                visible:false
+            }
+        }
+    ]
+
+    transitions: [
+        Transition {
+            to: "visible"
+            ParallelAnimation {
+                YAnimator {
+                    // NOTE this is necessary as otherwise the keyboard always starts the transition with Y as 0, due to the internal reparenting happening when becomes active
+                    from: inputPanel.parent.height
+                    duration: PlasmaCore.Units.longDuration
+                    easing.type: Easing.OutQuad
+                }
+                OpacityAnimator {
+                    duration: PlasmaCore.Units.longDuration
+                    easing.type: Easing.OutQuad
+                }
+            }
+        },
+        Transition {
+            to: "hidden"
+            ParallelAnimation {
+                YAnimator {
+                    duration: PlasmaCore.Units.longDuration
+                    easing.type: Easing.InQuad
+                }
+                OpacityAnimator {
+                    duration: PlasmaCore.Units.longDuration
+                    easing.type: Easing.InQuad
+                }
+            }
+        }
+    ]
 }
diff --git a/components/WallpaperFader.qml b/components/WallpaperFader.qml
index f474acc..c695d69 100644
--- a/components/WallpaperFader.qml
+++ b/components/WallpaperFader.qml
@@ -64,9 +64,9 @@ Item {
             textureMirroring: ShaderEffectSource.NoMirroring
         }
 
-        readonly property real contrast: 0.45 * wallpaperFader.factor + (1 - wallpaperFader.factor)
-        readonly property real saturation: 1.7 * wallpaperFader.factor + (1 - wallpaperFader.factor)
-        readonly property real intensity: (wallpaperFader.lightBackground ? 1.7 : 0.45) * wallpaperFader.factor + (1 - wallpaperFader.factor)
+        readonly property real contrast: 0.65 * wallpaperFader.factor + (1 - wallpaperFader.factor)
+        readonly property real saturation: 1.6 * wallpaperFader.factor + (1 - wallpaperFader.factor)
+        readonly property real intensity: (wallpaperFader.lightBackground ? 1.7 : 0.6) * wallpaperFader.factor + (1 - wallpaperFader.factor)
 
         readonly property real transl: (1.0 - contrast) / 2.0;
         readonly property real rval: (1.0 - saturation) * 0.2126;