Merge lp:~osomon/webbrowser-app/delay-showing-fullscreen-hint into lp:webbrowser-app

[Olivier Tilloy]

Delay showing the fullscreen hint to prevent it from jumping up while the webview is being resized.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1003
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1743/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2726/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/500
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/500/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/500
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2352/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2724
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2724/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20392

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

LGTM and works as expected

review: Approve

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-05-06 21:51:16 +0000
+++ src/app/webbrowser/Browser.qml	2015-05-12 07:46:41 +0000
@@ -719,6 +719,15 @@
                             }
                         }
 
+                        // Delay showing the hint to prevent it from jumping up while the
+                        // webview is being resized (https://launchpad.net/bugs/1454097).
+                        visible: false
+                        Timer {
+                            running: true
+                            interval: 250
+                            onTriggered: fullscreenExitHint.visible = true
+                        }
+
                         Label {
                             color: "white"
                             font.weight: Font.Light
@@ -729,7 +738,7 @@
                         }
 
                         Timer {
-                            running: true
+                            running: fullscreenExitHint.visible
                             interval: 2000
                             onTriggered: fullscreenExitHint.opacity = 0
                         }