Merge lp:~tiagosh/messaging-app/fix_swipe-demo_text_position into lp:messaging-app
Status: | Merged |
---|---|
Approved by: | Gustavo Pichorim Boiko |
Approved revision: | 516 |
Merged at revision: | 517 |
Proposed branch: | lp:~tiagosh/messaging-app/fix_swipe-demo_text_position |
Merge into: | lp:messaging-app |
Diff against target: |
23 lines (+2/-3) 1 file modified
src/qml/SwipeItemDemo.qml (+2/-3) |
To merge this branch: | bzr merge lp:~tiagosh/messaging-app/fix_swipe-demo_text_position |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gustavo Pichorim Boiko (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+286911@code.launchpad.net |
Commit message
Makes text in the swipe demo use relative positioning instead of absolute.
Description of the change
This MR was created by Daniyaal Rasheed as a google code-in task, but it needs sync with trunk in order to get landed, so we are resubmitting the MR here. This is the original description:
"""
I've deleted the absolute height specification inside of the RowLayout so that the height of the message is entirely dependent on the height of the dragMessage. The "Got it" button is anchored to the bottom of the message because if it was anchored to the top, then it would jump around whenever the number of lines in the text increased or decreased. Then I changed the bottomMargin of the "Got it" button to be units.gu(21) instead of 19 because the message row layout used to have a height of 3 and the button was anchored to its top instead of bottom.
"""
FAILED: Continuous integration, rev:516 jenkins. qa.ubuntu. com/job/ messaging- app-ci/ 960/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 6607/console jenkins. qa.ubuntu. com/job/ messaging- app-vivid- i386-ci/ 469/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6618/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/messaging- app-ci/ 960/rebuild
http://