From b446b82c7ba019c1194a6c802adbf93abf7ed48f Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 2 Mar 2022 06:59:27 -0800
Subject: [PATCH] improvements to controller scroll groups

---
 src/main/base/browserwindow.ts         |  4 ----
 src/renderer/index.js                  | 21 +++++++++++++++++----
 src/renderer/views/app/app-content.ejs |  2 +-
 src/renderer/views/app/sidebar.ejs     |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 739c2623..a1cb7e23 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -184,10 +184,6 @@ export class BrowserWindow {
                     page: "plugins-github",
                     component: `<plugins-github></plugins-github>`,
                     condition: `page == 'plugins-github'`
-                }, {
-                    page: "podcasts",
-                    component: `<apple-podcasts></apple-podcasts>`,
-                    condition: `page == 'podcasts'`
                 }, {
                     page: "remote-pair",
                     component: `<remote-pair></remote-pair>`,
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 6c180499..bba6b0e0 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -336,6 +336,7 @@ const app = new Vue({
             let buttonPressDelay = 500
             let stickDeadZone = 0.2
             let scrollGroup = null
+            let scrollGroupY = null
 
             let cursorSpeed = cursorSpeedPvt
 
@@ -374,11 +375,14 @@ const app = new Vue({
                 }
 
                 // RIGHT STICK.
-                if (gp.axes[3] > stickDeadZone) {
-                    $("#app-content").scrollTop($("#app-content").scrollTop() + (gp.axes[3] * scrollSpeed))
-                } else if (gp.axes[3] < -stickDeadZone) {
-                    $("#app-content").scrollTop($("#app-content").scrollTop() + (gp.axes[3] * scrollSpeed))
+                if(scrollGroupY) {
+                    if (gp.axes[3] > stickDeadZone) {
+                        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
+                    } else if (gp.axes[3] < -stickDeadZone) {
+                        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
+                    }
                 }
+                
 
 
                 if (scrollGroup) {
@@ -472,6 +476,15 @@ const app = new Vue({
 
                 if (element) {
                     let closest = element.closest("[tabindex], input, button, a")
+
+                    // VERT SCROLL
+                    let scrollGroupCloY = element.closest(`[scrollaxis="y"]`)
+                    if (scrollGroupCloY) {
+                        scrollGroupY = scrollGroupCloY
+                    }
+                    
+
+                    //  HOZ SCROLL
                     let scrollGroupClo = element.closest(".v-hl-container")
 
                     if (scrollGroupClo) {
diff --git a/src/renderer/views/app/app-content.ejs b/src/renderer/views/app/app-content.ejs
index c5fa06bc..38549d75 100644
--- a/src/renderer/views/app/app-content.ejs
+++ b/src/renderer/views/app/app-content.ejs
@@ -1,4 +1,4 @@
-<div id="app-content" :style="{'overflow': (chrome.contentAreaScrolling ? '' : 'hidden')}">
+<div id="app-content" scrollaxis="y" :style="{'overflow': (chrome.contentAreaScrolling ? '' : 'hidden')}">
     <div id="navigation-bar">
         <button class="nav-item" @click="navigateBack()">
             <%- include('../svg/chevron-left.svg') %>
diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs
index deaf7bba..65aa3688 100644
--- a/src/renderer/views/app/sidebar.ejs
+++ b/src/renderer/views/app/sidebar.ejs
@@ -19,7 +19,7 @@
             </button>
         </div>
     </div>
-    <div class="app-sidebar-content">
+    <div class="app-sidebar-content" scrollaxis="y">
         <div class="app-sidebar-header-text">
             {{$root.getLz('app.name')}}
         </div>