From 18a66fa9c2855e3d0b8996e9b62eba4efaa057dc Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Thu, 27 Apr 2023 19:40:41 +0200
Subject: changes from other branches (#2244)

---
 lib/api/page_specs.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'lib/api/page_specs.py')

diff --git a/lib/api/page_specs.py b/lib/api/page_specs.py
index f7cec8c6..7b023683 100644
--- a/lib/api/page_specs.py
+++ b/lib/api/page_specs.py
@@ -10,14 +10,21 @@ page_specs = Blueprint('page_specs', __name__)
 
 @page_specs.route('')
 def get_page_specs():
+    svg = g.extension.document.getroot()
+    width = svg.get('width', 0)
+    height = svg.get('height', 0)
+    pagecolor = "white"
+    deskcolor = "white"
 
-    metadata = g.extension.get_inkstitch_metadata()
+    namedview = svg.namedview
+    if namedview is not None:
+        pagecolor = namedview.get('pagecolor', pagecolor)
+        deskcolor = namedview.get('inkscape:deskcolor', deskcolor)
 
     page_specs = {
-        "width": metadata.document.get('width'),
-        "height": metadata.document.get('height'),
-        "pagecolor": metadata.document[1].get('pagecolor'),
-        "deskcolor": metadata.document[1].get('inkscape:deskcolor')
+        "width": width,
+        "height": height,
+        "pagecolor": pagecolor,
+        "deskcolor": deskcolor
     }
-
     return jsonify(page_specs)
-- 
cgit v1.2.3