Fix Flickable height (all tests pass now)
commitc38ce61540d076b2de09bd78f067d56921e1c4cf
authorJosh Arenson <joshua.arenson@canonical.com>
dateFri 22 Apr 2016, 13:56 (11 years ago)
parenta12f40b
qml/Dash/PageHeaderExtraPanel.qml+10−2
@@ -150,8 +150,16 @@ Item {
150150
151151 readonly property alias active: primaryFilter.active
152152
153− height: contentHeight > dashNavigation.availableHeight ?
154− dashNavigation.availableHeight : contentHeight
153+ height: {
154+ if (!active) {
155+ return 0;
156+ }
157+ else if (contentHeight > dashNavigation.availableHeight) {
158+ return dashNavigation.availableHeight;
159+ } else {
160+ return contentHeight;
161+ }
162+ }
155163
156164 clip: contentY < contentHeight
157165 contentHeight: primaryFilter.implicitHeight