Skip to content

qml: fix bounce back action with/without animation #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvngr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

qml: fix bounce back action with/without animation #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions qml/Keyboard.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,12 @@ Item {
if (keyboardSurface.y > jumpBackThreshold) {
MaliitGeometry.shown = false;
} else {
bounceBackAnimation.from = keyboardSurface.y
bounceBackAnimation.start();
if (maliit_input_method.animationEnabled) {
bounceBackAnimation.from = keyboardSurface.y;
bounceBackAnimation.start();
} else {
keyboardSurface.y = 0;
}
}
}

Expand Down Expand Up @@ -191,10 +195,7 @@ Item {

PropertyAnimation {
id: bounceBackAnimation
// Animations don't have an "enabled" property, so just set the
// target to null if animation is disabled, which effectively also
// disables the animation.
target: Keyboard.animationEnabled ? keyboardSurface : null
target: keyboardSurface
properties: "y"
easing.type: Easing.OutBounce;
easing.overshoot: 2.0
Expand Down