From ead4f293a9a26fef326470e69ecee502ba3ade13 Mon Sep 17 00:00:00 2001
From: Fabio Marmiroli <fmarmiroli@zensistemi.com>
Date: Fri, 13 Nov 2015 13:25:31 +0100
Subject: [PATCH 1/4] Implemented workspace switching by scrolling on and the
 edge of the dock when using fixed-sized icons

---
 myDash.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/myDash.js b/myDash.js
index 6b917ceeb..9d417525a 100644
--- a/myDash.js
+++ b/myDash.js
@@ -555,6 +555,21 @@ const myDash = new Lang.Class({
         if (!this._dtdSettings.get_boolean('icon-size-fixed'))
           return Clutter.EVENT_PROPAGATE;
 
+        // Event coordinates are relative to the stage but can be transformed
+        // as the actor will only receive events within his bounds.
+        let stage_x, stage_y, ok, event_x, event_y, actor_w, actor_h;
+        [stage_x, stage_y] = event.get_coords();
+        [ok, event_x, event_y] = this.actor.transform_stage_point(stage_x, stage_y);
+        [actor_w, actor_h] = this.actor.get_size();
+
+        // If the scroll event is within a 1px margin from
+        // the relevant edge of the actor, let the event propagate.
+        if ((this._position == St.Side.LEFT && event_x <= 1)
+            || (this._position == St.Side.RIGHT && event_x >= actor_w - 2)
+            || (this._position == St.Side.TOP && event_y <= 1)
+            || (this._position == St.Side.BOTTOM && event_y >= actor_h - 2))
+            return Clutter.EVENT_PROPAGATE;
+            
         // reset timeout to avid conflicts with the mousehover event
         if (this._ensureAppIconVisibilityTimeoutId>0) {
             Mainloop.source_remove(this._ensureAppIconVisibilityTimeoutId);

From 21b9ad0c89988b36b2d250fec3f7b82505225aaf Mon Sep 17 00:00:00 2001
From: Fabio Marmiroli <fmarmiroli@zensistemi.com>
Date: Fri, 13 Nov 2015 19:34:46 +0100
Subject: [PATCH 2/4] Added explanation in the settings UI

---
 Settings.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Settings.ui b/Settings.ui
index 9ff326159..5b8d8a4cf 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -1132,7 +1132,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">If icons overflow the dock, only  the &lt;i&gt;Show Applications&lt;/i&gt; icon is active.</property>
+                            <property name="label" translatable="yes">If icons overflow the dock, only the edge of the dock and the &lt;i&gt;Show Applications&lt;/i&gt; icon are active.</property>
                             <property name="use_markup">True</property>
                             <property name="wrap">True</property>
                             <style>

From b965492d6f953ebd0ca1404312e7988ff63f8a2b Mon Sep 17 00:00:00 2001
From: marmis85 <marmis85@gmail.com>
Date: Sat, 14 Nov 2015 04:04:54 +0100
Subject: [PATCH 3/4] use the actor that is passed to the _OnScrollEvent
 function

---
 myDash.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/myDash.js b/myDash.js
index 9d417525a..bb22190e9 100644
--- a/myDash.js
+++ b/myDash.js
@@ -559,8 +559,8 @@ const myDash = new Lang.Class({
         // as the actor will only receive events within his bounds.
         let stage_x, stage_y, ok, event_x, event_y, actor_w, actor_h;
         [stage_x, stage_y] = event.get_coords();
-        [ok, event_x, event_y] = this.actor.transform_stage_point(stage_x, stage_y);
-        [actor_w, actor_h] = this.actor.get_size();
+        [ok, event_x, event_y] = actor.transform_stage_point(stage_x, stage_y);
+        [actor_w, actor_h] = actor.get_size();
 
         // If the scroll event is within a 1px margin from
         // the relevant edge of the actor, let the event propagate.

From 2c70d3df714a22c5b69954d8351427db9771c258 Mon Sep 17 00:00:00 2001
From: Fabio Marmiroli <fmarmiroli@zensistemi.com>
Date: Mon, 23 Nov 2015 15:29:56 +0100
Subject: [PATCH 4/4] Let the event propagate if there is no need to scroll

---
 myDash.js | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/myDash.js b/myDash.js
index bb22190e9..14837e2c4 100644
--- a/myDash.js
+++ b/myDash.js
@@ -553,7 +553,10 @@ const myDash = new Lang.Class({
 
         // If scroll is not used because the icon is resized, let the scroll event propagate.
         if (!this._dtdSettings.get_boolean('icon-size-fixed'))
-          return Clutter.EVENT_PROPAGATE;
+            return Clutter.EVENT_PROPAGATE;
+
+        let monitorIndex = this._dtdSettings.get_int('preferred-monitor');
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
 
         // Event coordinates are relative to the stage but can be transformed
         // as the actor will only receive events within his bounds.
@@ -562,14 +565,31 @@ const myDash = new Lang.Class({
         [ok, event_x, event_y] = actor.transform_stage_point(stage_x, stage_y);
         [actor_w, actor_h] = actor.get_size();
 
-        // If the scroll event is within a 1px margin from
-        // the relevant edge of the actor, let the event propagate.
-        if ((this._position == St.Side.LEFT && event_x <= 1)
-            || (this._position == St.Side.RIGHT && event_x >= actor_w - 2)
-            || (this._position == St.Side.TOP && event_y <= 1)
-            || (this._position == St.Side.BOTTOM && event_y >= actor_h - 2))
-            return Clutter.EVENT_PROPAGATE;
-            
+        // If there is no need to scroll, or if the scroll event is within a 1px
+        // margin from the relevant edge of the actor, let the event propagate.
+        switch( this._position ) {
+            case St.Side.LEFT:
+                if (workArea.height > this._container.height || actor.child.height < actor.height
+                    || event_x <= 1)
+                    return Clutter.EVENT_PROPAGATE;
+                break;
+            case St.Side.RIGHT:
+                if (workArea.height > this._container.height || actor.child.height < actor.height
+                    || event_x >= actor_w - 2)
+                    return Clutter.EVENT_PROPAGATE;
+                break;
+            case St.Side.TOP:
+                if (workArea.width > this._container.width || actor.child.width < actor.width
+                    || event_y <= 1)
+                    return Clutter.EVENT_PROPAGATE;
+                break;
+            case St.Side.BOTTOM:
+                if (workArea.width > this._container.width || actor.child.width < actor.width
+                    || event_y >= actor_h - 2)
+                    return Clutter.EVENT_PROPAGATE;
+                break;
+        }
+
         // reset timeout to avid conflicts with the mousehover event
         if (this._ensureAppIconVisibilityTimeoutId>0) {
             Mainloop.source_remove(this._ensureAppIconVisibilityTimeoutId);