From be6d499cbdf8921f8b760d9c56e8ae4f39a0b4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Fri, 17 Jan 2020 10:30:30 +0100
Subject: [PATCH] [calamares] add windows placement - will be introduced in
 3.2.18

---
 data/branding.desc.d    | 6 ++++++
 data/manjaro-tools.conf | 3 +++
 lib/util-iso-image.sh   | 6 ++++++
 lib/util.sh             | 2 ++
 4 files changed, 17 insertions(+)

diff --git a/data/branding.desc.d b/data/branding.desc.d
index e04c8ac..d88c06e 100644
--- a/data/branding.desc.d
+++ b/data/branding.desc.d
@@ -29,6 +29,12 @@ windowExpanding:    ${windowexp}
 # in CalamaresUtilsGui, 800x520.
 windowSize: ${windowsize}
 
+# Placement of Calamares window. Either "center" or "free".
+# Whether "center" actually works does depend on the window
+# manager in use (and only makes sense if you're not using
+# *windowExpanding* set to "fullscreen").
+windowPlacement: ${windowplacement}
+
 # These are strings shown to the user in the user interface.
 # There is no provision for translating them -- since they
 # are names, the string is included as-is.
diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index 284585e..b2adbdf 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -80,6 +80,9 @@
 # (possible units: pixel (px) or font-units (em))
 # windowsize="800px,520px"
 
+# placement of Calamares window, either "center" or "free".
+# windowplacement="center"
+
 # colors for text and background components:
 
 # background of the sidebar
diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index f356bed..7762e9b 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -168,6 +168,12 @@ windowExpanding:    ${windowexp}
 # in CalamaresUtilsGui, 800x520.
 windowSize: ${windowsize}
 
+# Placement of Calamares window. Either "center" or "free".
+# Whether "center" actually works does depend on the window
+# manager in use (and only makes sense if you're not using
+# *windowExpanding* set to "fullscreen").
+windowPlacement: ${windowplacement}
+
 # These are strings shown to the user in the user interface.
 # There is no provision for translating them -- since they
 # are names, the string is included as-is.
diff --git a/lib/util.sh b/lib/util.sh
index e8853df..73d1bfc 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -342,6 +342,8 @@ init_calamares(){
 	[[ -z ${windowexp} ]] && windowexp=noexpand
 	
 	[[ -z ${windowsize} ]] && windowsize="800px,520px"
+
+	[[ -z ${windowplacement} ]] && windowplacement="center"
 	
 	[[ -z ${sidebarbackground} ]] && sidebarbackground=#454948