Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/contentYabsY into lp:ubuntu-ui-toolkit/staging

  1. contentYabsY
  2. Merge into staging
Proposed by Christian Dywan on 2015-03-18
Status: Merged
Approved by: Zsombor Egri on 2015-03-18
Approved revision: 1451
Merged at revision: 1451
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/contentYabsY
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 11 lines (+1/-1)
1 file modified
modules/Ubuntu/Components/TextCursor.qml (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/contentYabsY
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-03-18
Zsombor Egri (community) 2015-03-18 Approve on 2015-03-18
Review via email: mp+253387@code.launchpad.net

Commit Message

Check if flickable is set before inspecting contentY in absY

To post a comment you must log in.
Zsombor Egri (zsombi) wrote :

Nice catch!

review: Needs Fixing
Zsombor Egri (zsombi) wrote :

Uhm... wrong status, sorry!

review: Approve
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
2--- modules/Ubuntu/Components/TextCursor.qml 2015-03-10 11:49:27 +0000
3+++ modules/Ubuntu/Components/TextCursor.qml 2015-03-18 15:53:19 +0000
4@@ -54,7 +54,7 @@
5 var flickable = handler.main;
6 do {
7 flickable = flickable.parent;
8- } while (!flickable.contentY && flickable != fakeCursor.parent);
9+ } while (flickable && !flickable.contentY && flickable != fakeCursor.parent);
10 return fakeCursor.parent.mapFromItem(handler.main, cursorItem.x, cursorItem.y).y
11 }
12

Subscribers

People subscribed via source and target branches