Merge lp:~fboucault/webbrowser-app/save_window_size into lp:webbrowser-app/staging

[Florian Boucault]

Store and restore on startup the size of each window.

Store and restore on startup the size of each window.

[Olivier Tilloy (osomon)]

Wouldn’t it be better to pass width and height as properties to windowFactory.createObject(…) in restoreWindowState(), instead of setting the properties after the window is created?

[lp:~fboucault/webbrowser-app/save_window_size]

1610. By Florian Boucault on 2017-02-20

Merged from staging

1611. By Florian Boucault on 2017-02-20

Pass width/height at Window creation time.

[Olivier Tilloy (osomon)]

LGTM, thanks!

review: Approve

=== modified file 'src/app/webbrowser/webbrowser-app.qml'
--- src/app/webbrowser/webbrowser-app.qml	2017-02-16 10:55:50 +0000
+++ src/app/webbrowser/webbrowser-app.qml	2017-02-20 13:42:34 +0000
@@ -306,8 +306,6 @@
     property var session: SessionStorage {
         dataFile: dataLocation + "/session.json"
 
-        // TODO: do we want to save/restore window positions too (https://launchpad.net/bugs/1312892)?
-
         function save() {
             if (!locked || restoring) {
                 return
@@ -366,11 +364,19 @@
             for (var i = 0; i < window.tabsModel.count; ++i) {
                 tabs.push(window.serializeTabState(window.tabsModel.get(i)))
             }
-            return {tabs: tabs, currentIndex: window.tabsModel.currentIndex}
+            return {tabs: tabs, currentIndex: window.tabsModel.currentIndex,
+                    width: window.width, height: window.height}
         }
 
         function restoreWindowState(state) {
-            var window = windowFactory.createObject(null)
+            var windowProperties = {}
+            if (state.width) {
+                windowProperties["width"] = state.width
+            }
+            if (state.height) {
+                windowProperties["height"] = state.height
+            }
+            var window = windowFactory.createObject(null, windowProperties)
             for (var i in state.tabs) {
                 window.tabsModel.add(window.restoreTabState(state.tabs[i]))
             }