From fd958842d26b112f12fecb7b1471f12ac609bc50 Mon Sep 17 00:00:00 2001
From: Artem Anufrij <artem.anufrij@live.de>
Date: Thu, 18 Oct 2018 22:19:39 +0200
Subject: [PATCH] fixed restore window size for webapps

---
 data/com.github.artemanufrij.webpin.appdata.xml |  4 ++++
 src/Windows/WebApp.vala                         | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/data/com.github.artemanufrij.webpin.appdata.xml b/data/com.github.artemanufrij.webpin.appdata.xml
index 0243463..c062e30 100644
--- a/data/com.github.artemanufrij.webpin.appdata.xml
+++ b/data/com.github.artemanufrij.webpin.appdata.xml
@@ -40,6 +40,10 @@
                     <li>Moved to Meson</li>
                     <li>Support for local .html files</li>
                 </ul>
+                <p>Fixed:</p>
+                <ul>
+                    <li>Restore correct window size</li>
+                </ul>
                 <p>Translation:</p>
                 <ul>
                     <li>Dutch (by Heimen Stoffels)</li>
diff --git a/src/Windows/WebApp.vala b/src/Windows/WebApp.vala
index 908cf64..d7e3336 100644
--- a/src/Windows/WebApp.vala
+++ b/src/Windows/WebApp.vala
@@ -174,7 +174,7 @@ namespace Webpin.Windows {
             if (width != null && height != null) {
                 set_default_size (int.parse (width), int.parse (height));
             } else {
-                set_default_size (1000,              600);
+                set_default_size (1000, 600);
             }
 
             if (x != null && y != null) {
@@ -198,10 +198,14 @@ namespace Webpin.Windows {
             } else {
                 int x, y;
                 this.get_position (out x, out y);
+
+                int width, height;
+                this.get_size (out width, out height);
+
                 desktop_file.edit_property ("X-Webpin-WindowX", x.to_string ());
                 desktop_file.edit_property ("X-Webpin-WindowY", y.to_string ());
-                desktop_file.edit_property ("X-Webpin-WindowWidth", this.get_allocated_width ().to_string ());
-                desktop_file.edit_property ("X-Webpin-WindowHeight", this.get_allocated_height ().to_string ());
+                desktop_file.edit_property ("X-Webpin-WindowWidth", width.to_string ());
+                desktop_file.edit_property ("X-Webpin-WindowHeight", height.to_string ());
                 desktop_file.edit_property ("X-Webpin-WindowMaximized", "norm");
             }
         }