3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 21:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Add soft animation to the entire popup and not only in the background.

Browse source 
This prevents the content to show before the background.

Contributes to CURA-5786.
This commit is contained in:
Diego Prado Gesto 2018-11-11 13:17:59 +01:00
parent f65b1f8fbc
commit 8a63a79896
1 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
resources/qml/ActionPanel/PrintInformationWidget.qml
View file

@ -7,29 +7,30 @@ import QtQuick.Controls 2.1
import UM 1.1 as UM
import Cura 1.0 as Cura
Button
UM.RecolorImage
{
id: widget
implicitHeight: UM.Theme.getSize("section_icon").height
implicitWidth: UM.Theme.getSize("section_icon").width
//implicitHeight: UM.Theme.getSize("section_icon").height
//implicitWidth: UM.Theme.getSize("section_icon").width
background: UM.RecolorImage
source: UM.Theme.getIcon("info")
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
sourceSize.width: width
sourceSize.height: height
color: popup.opened ? UM.Theme.getColor("primary") : UM.Theme.getColor("text_medium")
MouseArea
{
id: moreInformationIcon
source: UM.Theme.getIcon("info")
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
sourceSize.width: width
sourceSize.height: height
color: widget.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("text_medium")
anchors.fill: parent
hoverEnabled: true
onEntered: popup.open()
onExited: popup.close()
}
onClicked: popup.opened ? popup.close() : popup.open()
Popup
{
id: popup
@ -39,6 +40,9 @@ Button
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
opacity: opened ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }
contentItem: PrintJobInformation
{
id: printJobInformation
@ -47,8 +51,6 @@ Button
background: UM.PointingRectangle
{
opacity: visible ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }
color: UM.Theme.getColor("tool_panel_background")
borderColor: UM.Theme.getColor("lining")
borderWidth: UM.Theme.getSize("default_lining").width