git.iko.soy/unity8
on xenial help sign in
Fix Flickable height (all tests pass now)
c38ce61Josh Arenson
qml/Dash/PageHeaderExtraPanel.qml+10−2
compare with xenial
unifiedsplit
@@ -150,8 +150,16 @@ Item {
150
150
151 readonly property alias active: primaryFilter.active
151 readonly property alias active: primaryFilter.active
152
152
153+ height: {
154+ if (!active) {
155+ return 0;
156+ }
153− height: contentHeight > dashNavigation.availableHeight ?
157+ else if (contentHeight > dashNavigation.availableHeight) {
154− dashNavigation.availableHeight : contentHeight
158+ return dashNavigation.availableHeight;
159+ } else {
160+ return contentHeight;
161+ }
162+ }
155
163
156 clip: contentY < contentHeight
164 clip: contentY < contentHeight
157 contentHeight: primaryFilter.implicitHeight
165 contentHeight: primaryFilter.implicitHeight