~abreu-alexandre/webbrowser-app/theme-color-meta-detection

« back to all changes in this revision

Viewing changes to src/app/webbrowser/NewTabView.qml

  • Committer: CI Train Bot
  • Author(s): Olivier Tilloy
  • Date: 2015-12-22 18:15:44 UTC
  • mfrom: (1297.3.1 webbrowser-app)
  • Revision ID: ci-train-bot@canonical.com-20151222181544-bf0gkt4abzhozink
Fix a crash when clearing the navigation history while the new tab view is open. Fixes: #1525937
Approved by: Ugo Riboni

Show diffs side-by-side

added added

removed removed

Lines of Context:
275
275
                    // reassigning it to all Column children except this one.
276
276
                    rightMargin: - contentColumn.anchors.rightMargin
277
277
                }
278
 
                height: childrenRect.height
 
278
                height: grid.contentHeight + units.gu(1)
279
279
                clip: true
280
280
 
281
281
                UrlPreviewGrid {
287
287
                        right: parent.right
288
288
                        top: parent.top
289
289
                        topMargin: units.gu(2)
 
290
                        bottom: parent.bottom
290
291
                    }
291
292
 
292
293
                    horizontalMargin: units.gu(1)