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

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 :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
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 :
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
=== modified file 'src/Ubuntu/Browser/Browser.qml'
--- src/Ubuntu/Browser/Browser.qml 2013-05-24 15:36:04 +0000
+++ src/Ubuntu/Browser/Browser.qml 2013-05-29 10:35:32 +0000
@@ -352,6 +352,17 @@
352 }352 }
353 }353 }
354354
355 Suggestions {
356 visible: panel.chrome && panel.chrome.addressBar.activeFocus && (count > 0)
357 anchors {
358 bottom: panel.top
359 horizontalCenter: parent.horizontalCenter
360 }
361 width: panel.width - units.gu(5)
362 height: Math.min(contentHeight, panel.y - units.gu(2))
363 onSelected: browser.url = url
364 }
365
355 KeyboardRectangle {366 KeyboardRectangle {
356 id: osk367 id: osk
357 }368 }
358369
=== modified file 'src/Ubuntu/Browser/Chrome.qml'
--- src/Ubuntu/Browser/Chrome.qml 2013-05-20 11:45:18 +0000
+++ src/Ubuntu/Browser/Chrome.qml 2013-05-29 10:35:32 +0000
@@ -105,18 +105,6 @@
105 fgColor: "white"105 fgColor: "white"
106 }106 }
107107
108 Suggestions {
109 id: suggestions
110 visible: addressBar.activeFocus && (count > 0)
111 anchors {
112 bottom: parent.top
113 horizontalCenter: parent.horizontalCenter
114 }
115 width: parent.width - units.gu(5)
116 height: Math.min(contentHeight, units.gu(40))
117 onSelected: chrome.urlValidated(url)
118 }
119
120 Image {108 Image {
121 anchors.bottom: parent.top109 anchors.bottom: parent.top
122 anchors.left: parent.left110 anchors.left: parent.left

Subscribers

People subscribed via source and target branches

to status/vote changes: