From 79ad84d4aee90ef568f2e0e60fa70dc05d9602b0 Mon Sep 17 00:00:00 2001
From: Marius Meisenzahl <mariusmeisenzahl@gmail.com>
Date: Sun, 19 Jul 2020 20:14:07 +0200
Subject: [PATCH 1/3] Make zoom factor and zoom step size adjustable

---
 data/gala.gschema.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml
index f9fa61692..51b54a1e8 100644
--- a/data/gala.gschema.xml
+++ b/data/gala.gschema.xml
@@ -95,6 +95,18 @@
 			<summary>Automatically move maximized windows to a new workspace</summary>
 			<description></description>
 		</key>
+		<key type="d" name="maximum-zoom-factor">
+			<range min="1.0" max="10.0"/>
+			<default>2.5</default>
+			<summary>The maximum zoom factor</summary>
+			<description>The maximum zoom factor</description>
+		</key>
+		<key type="d" name="zoom-step-size">
+			<range min="0.5" max="2.5"/>
+			<default>0.5</default>
+			<summary>The zoom step size</summary>
+			<description>The zoom step size</description>
+		</key>
 	</schema>
 	
 	<schema path="/org/pantheon/desktop/gala/keybindings/" id="org.pantheon.desktop.gala.keybindings">

From 9d1eaa3dbce7b683940830a6f874dadc73669671 Mon Sep 17 00:00:00 2001
From: Marius Meisenzahl <mariusmeisenzahl@gmail.com>
Date: Sun, 19 Jul 2020 20:26:31 +0200
Subject: [PATCH 2/3] Make maximum zoom factor 10

---
 data/gala.gschema.xml  | 12 ------------
 plugins/zoom/Main.vala |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml
index 51b54a1e8..f9fa61692 100644
--- a/data/gala.gschema.xml
+++ b/data/gala.gschema.xml
@@ -95,18 +95,6 @@
 			<summary>Automatically move maximized windows to a new workspace</summary>
 			<description></description>
 		</key>
-		<key type="d" name="maximum-zoom-factor">
-			<range min="1.0" max="10.0"/>
-			<default>2.5</default>
-			<summary>The maximum zoom factor</summary>
-			<description>The maximum zoom factor</description>
-		</key>
-		<key type="d" name="zoom-step-size">
-			<range min="0.5" max="2.5"/>
-			<default>0.5</default>
-			<summary>The zoom step size</summary>
-			<description>The zoom step size</description>
-		</key>
 	</schema>
 	
 	<schema path="/org/pantheon/desktop/gala/keybindings/" id="org.pantheon.desktop.gala.keybindings">
diff --git a/plugins/zoom/Main.vala b/plugins/zoom/Main.vala
index 4f2d326c3..7a4b79e1e 100644
--- a/plugins/zoom/Main.vala
+++ b/plugins/zoom/Main.vala
@@ -82,7 +82,7 @@ namespace Gala.Plugins.Zoom {
             // Nothing to do if zooming out of our bounds is requested
             if (current_zoom <= 1.0f && !@in)
                 return;
-            else if (current_zoom >= 2.5f && @in)
+            else if (current_zoom >= 10.0f && @in)
                 return;
 
             var wins = wm.ui_group;

From 4a0c920faf4aa705c9de6e1b294cb94737e03471 Mon Sep 17 00:00:00 2001
From: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
Date: Tue, 21 Jul 2020 20:37:06 +0200
Subject: [PATCH 3/3] Update plugins/zoom/Main.vala
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Daniel Foré <daniel@elementary.io>
---
 plugins/zoom/Main.vala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/zoom/Main.vala b/plugins/zoom/Main.vala
index 7a4b79e1e..b2fb72bdd 100644
--- a/plugins/zoom/Main.vala
+++ b/plugins/zoom/Main.vala
@@ -83,6 +83,7 @@ namespace Gala.Plugins.Zoom {
             if (current_zoom <= 1.0f && !@in)
                 return;
             else if (current_zoom >= 10.0f && @in)
+                Gdk.beep ();
                 return;
 
             var wins = wm.ui_group;