Merge lp:~ahayzen/music-app/fix-1514143-workaround into lp:music-app

Proposed by Andrew Hayzen on 2015-11-16
Status: Merged
Approved by: Victor Thompson on 2015-11-17
Approved revision: 941
Merged at revision: 941
Proposed branch: lp:~ahayzen/music-app/fix-1514143-workaround
Merge into: lp:music-app
Diff against target: 26 lines (+6/-0)
2 files modified
app/components/HeadState/SearchHeadState.qml (+5/-0)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~ahayzen/music-app/fix-1514143-workaround
Reviewer Review Type Date Requested Status
Victor Thompson 2015-11-16 Approve on 2015-11-17
Jenkins Bot continuous-integration Approve on 2015-11-17
Review via email: mp+277611@code.launchpad.net

Commit message

* Workaround for bug 1514143 by locking the header when searching

Description of the change

* Workaround for bug 1514143 by locking the header when searching

The issue comes from using a flickable with a movable header, so for now the header is made static when in searching mode.

To post a comment you must log in.
review: Approve (continuous-integration)
Victor Thompson (vthompson) wrote :

This looks good! Just one small inline comment.

review: Needs Fixing
940. By Andrew Hayzen on 2015-11-17

* Add code comment for fixed header height

941. By Andrew Hayzen on 2015-11-17

* Merge of trunk

review: Approve (continuous-integration)
Victor Thompson (vthompson) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/HeadState/SearchHeadState.qml'
2--- app/components/HeadState/SearchHeadState.qml 2015-08-12 23:36:44 +0000
3+++ app/components/HeadState/SearchHeadState.qml 2015-11-17 02:00:33 +0000
4@@ -56,6 +56,11 @@
5 if (state === "default") {
6 searchField.text = ""
7 }
8+
9+ // FIXME: Workaround for pad.lv/1514143 (keyboard show/hide on view moving)
10+ // by locking the header and forcing a topMargin of page to the header height
11+ headerState.head.locked = state === headerState.name;
12+ thisPage.anchors.topMargin = state === headerState.name ? units.gu(6.125) : 0 // FIXME: 6.125 is header.height
13 }
14
15 onVisibleChanged: {
16
17=== modified file 'debian/changelog'
18--- debian/changelog 2015-11-17 01:51:14 +0000
19+++ debian/changelog 2015-11-17 02:00:33 +0000
20@@ -15,6 +15,7 @@
21
22 [ Andrew Hayzen ]
23 * Switch to using the new uc1.3 listitems within the SDK
24+ * Workaround for bug 1514143 by locking the header when searching (LP: #1514143)
25
26 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Tue, 08 Sep 2015 10:08:49 +0200
27

Subscribers

People subscribed via source and target branches