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.
commit5746403805d4363aa3438b7b84fce5b70dd0675b authorMirco Müller <mirco.mueller@ubuntu.com> dateTue 4 Nov 2014, 18:45 (12 years ago) parent545d96e
2 files changed+2−25
compare with xenial
unifiedsplit
qml/Notifications/Notification.qml+2−19 qml/Notifications/OptionToggle.qml−6
qml/Notifications/Notification.qml+2−19
@@ -93,13 +93,8 @@ Item {
9393
9494 //enabled: menuItemFactory.progress == 1
9595 enabled: true
96− SequentialAnimation {
97− PauseAnimation {
98− duration: UbuntuAnimation.SnapDuration
99− }
100− UbuntuNumberAnimation {
101− duration: UbuntuAnimation.SnapDuration
102− }
96+ UbuntuNumberAnimation {
97+ duration: UbuntuAnimation.SnapDuration
10398 }
10499 }
105100
@@ -172,18 +167,6 @@ Item {
172167 }
173168 }
174169
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−
187170 MouseArea {
188171 id: interactiveArea
189172
qml/Notifications/OptionToggle.qml−6
@@ -29,12 +29,6 @@ UbuntuShape {
2929
3030 signal triggered(string id)
3131
32− Behavior on height {
33− UbuntuNumberAnimation {
34− duration: UbuntuAnimation.SnapDuration
35− }
36− }
37−
3832 color: Theme.palette.normal.base
3933 borderSource: "none"
4034 height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight