git.iko.soy/unity8
on xenial help sign in
Fix height-animation issue with expansion of OptionToggle widget and framing notification/UbuntuShape being out of sync.
5746403Mirco Müller
qml/Notifications/Notification.qml+2−19
compare with xenial
unifiedsplit
@@ -93,13 +93,8 @@ Item {
93
93
94 //enabled: menuItemFactory.progress == 1
94 //enabled: menuItemFactory.progress == 1
95 enabled: true
95 enabled: true
96− SequentialAnimation {
97− PauseAnimation {
98− duration: UbuntuAnimation.SnapDuration
99− }
100− UbuntuNumberAnimation {
96+ UbuntuNumberAnimation {
101− duration: UbuntuAnimation.SnapDuration
97+ duration: UbuntuAnimation.SnapDuration
102− }
103 }
98 }
104 }
99 }
105
100
@@ -172,18 +167,6 @@ Item {
172 }
167 }
173 }
168 }
174
169
175− Behavior on implicitHeight {
176− id: heightBehavior
177−
178− enabled: false
179− UbuntuNumberAnimation {
180− duration: UbuntuAnimation.SnapDuration
181− }
182− }
183−
184− // delay enabling height behavior until the add transition is complete
185− onOpacityChanged: if (opacity == 1) heightBehavior.enabled = true
186−
187 MouseArea {
170 MouseArea {
188 id: interactiveArea
171 id: interactiveArea
189
172
qml/Notifications/OptionToggle.qml−6
@@ -29,12 +29,6 @@ UbuntuShape {
29
29
30 signal triggered(string id)
30 signal triggered(string id)
31
31
32− Behavior on height {
33− UbuntuNumberAnimation {
34− duration: UbuntuAnimation.SnapDuration
35− }
36− }
37−
38 color: Theme.palette.normal.base
32 color: Theme.palette.normal.base
39 borderSource: "none"
33 borderSource: "none"
40 height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
34 height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight