webbrowser-app

Merge lp:~osomon/webbrowser-app/fix-suggestions-height into lp:webbrowser-app

  1. fix-suggestions-height
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 146
Merged at revision: 153
Proposed branch: lp:~osomon/webbrowser-app/fix-suggestions-height
Merge into: lp:webbrowser-app
Diff against target: 44 lines (+11/-12)
2 files modified
src/Ubuntu/Browser/Browser.qml (+11/-0)
src/Ubuntu/Browser/Chrome.qml (+0/-12)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/fix-suggestions-height
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Renato Araujo Oliveira Filho (community) Approve
Review via email: mp+166210@code.launchpad.net

Commit message

Ensure the suggestions list never goes offscreen.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1721

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/103/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/106/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/68
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/103/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/103
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1753

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/106/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/105
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1754/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/108/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/109/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/106
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/106
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1756

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/109/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/110/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/107
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1757

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/110/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1768

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/112/rebuild

review: Approve (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

works nice.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-autolanding/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-autolanding/51
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-autolanding/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-autolanding/51
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1786

review: Needs Fixing (continuous-integration)
Revision history for this message
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 'src/Ubuntu/Browser/Browser.qml'
2--- src/Ubuntu/Browser/Browser.qml 2013-05-24 15:36:04 +0000
3+++ src/Ubuntu/Browser/Browser.qml 2013-05-29 10:35:32 +0000
4@@ -352,6 +352,17 @@
5 }
6 }
7
8+ Suggestions {
9+ visible: panel.chrome && panel.chrome.addressBar.activeFocus && (count > 0)
10+ anchors {
11+ bottom: panel.top
12+ horizontalCenter: parent.horizontalCenter
13+ }
14+ width: panel.width - units.gu(5)
15+ height: Math.min(contentHeight, panel.y - units.gu(2))
16+ onSelected: browser.url = url
17+ }
18+
19 KeyboardRectangle {
20 id: osk
21 }
22
23=== modified file 'src/Ubuntu/Browser/Chrome.qml'
24--- src/Ubuntu/Browser/Chrome.qml 2013-05-20 11:45:18 +0000
25+++ src/Ubuntu/Browser/Chrome.qml 2013-05-29 10:35:32 +0000
26@@ -105,18 +105,6 @@
27 fgColor: "white"
28 }
29
30- Suggestions {
31- id: suggestions
32- visible: addressBar.activeFocus && (count > 0)
33- anchors {
34- bottom: parent.top
35- horizontalCenter: parent.horizontalCenter
36- }
37- width: parent.width - units.gu(5)
38- height: Math.min(contentHeight, units.gu(40))
39- onSelected: chrome.urlValidated(url)
40- }
41-
42 Image {
43 anchors.bottom: parent.top
44 anchors.left: parent.left

Subscribers

People subscribed via source and target branches

to status/vote changes: