Merge lp:~tiagosh/messaging-app/set_width_based_on_screen_size into lp:messaging-app

[Tiago Salem Herrmann]

Set width based on the screen size to avoid removing views from the stack when the app is resized.

Set width based on the screen size to avoid removing views from the stack when the app is resized.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:516
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/962/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6622/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/471/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6633/console

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2016-02-17 12:44:17 +0000
+++ src/qml/messaging-app.qml	2016-02-24 18:25:48 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.2
+import QtQuick.Window 2.2
 import Qt.labs.settings 1.0
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
@@ -146,7 +147,7 @@
     }
 
     automaticOrientation: true
-    width: units.gu(100)
+    width: Screen.desktopAvailableWidth > units.gu(100) ? units.gu(100) : units.gu(40)
     height: units.gu(71)
     anchorToKeyboard: false