From e9db2d5698921cb55c2e2bd1e11a20665898d1ee Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 20 Feb 2017 15:06:31 +0100 Subject: [PATCH] feat(ui/modules/Common/Popup): remove animation --- .../Common/Popup/AbstractDropDownMenu.qml | 37 ++----------------- .../ui/modules/Common/Popup/DesktopPopup.qml | 20 +--------- .../Common/Styles/Popup/PopupStyle.qml | 5 --- 3 files changed, 6 insertions(+), 56 deletions(-) diff --git a/linphone-desktop/ui/modules/Common/Popup/AbstractDropDownMenu.qml b/linphone-desktop/ui/modules/Common/Popup/AbstractDropDownMenu.qml index ffdcae0be..cd68d14cb 100644 --- a/linphone-desktop/ui/modules/Common/Popup/AbstractDropDownMenu.qml +++ b/linphone-desktop/ui/modules/Common/Popup/AbstractDropDownMenu.qml @@ -135,47 +135,18 @@ Item { menuOpened() } } - - NumberAnimation { - duration: PopupStyle.animation.openingDuration - easing.type: Easing.InOutQuad - property: 'opacity' - target: menu - } - - NumberAnimation { - duration: PopupStyle.animation.openingDuration - easing.type: Easing.InOutQuad - property: 'implicitHeight' - target: menu - } }, Transition { from: 'opened' to: '' - NumberAnimation { - duration: PopupStyle.animation.closingDuration - easing.type: Easing.InOutQuad - property: 'implicitHeight' - target: menu - } - SequentialAnimation { ScriptAction { - script: menuClosed() - } - - NumberAnimation { - duration: PopupStyle.animation.closingDuration - easing.type: Easing.InOutQuad - property: 'opacity' - target: menu - } - - ScriptAction { - script: visible = false + script: { + menuClosed() + visible = false + } } } } diff --git a/linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml b/linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml index 1785db63c..461958501 100644 --- a/linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml +++ b/linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml @@ -85,30 +85,14 @@ Item { } } } - - NumberAnimation { - duration: PopupStyle.animation.openingDuration - easing.type: Easing.InOutQuad - property: 'opacity' - target: popup - } }, Transition { from: 'opened' to: '' - SequentialAnimation { - NumberAnimation { - duration: PopupStyle.animation.closingDuration - easing.type: Easing.InOutQuad - property: 'opacity' - target: popup - } - - ScriptAction { - script: popup.showMinimized() - } + ScriptAction { + script: popup.showMinimized() } } ] diff --git a/linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml index 52b983e45..06da5ca32 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml @@ -8,11 +8,6 @@ import Common 1.0 QtObject { property color backgroundColor: Colors.k - property QtObject animation: QtObject { - property int openingDuration: 250 - property int closingDuration: 250 - } - property QtObject shadow: QtObject { property color color: Colors.l property int horizontalOffset: 2