improvements to controller scroll groups
This commit is contained in:
parent
66a659ad77
commit
b446b82c7b
4 changed files with 19 additions and 10 deletions
|
@ -184,10 +184,6 @@ export class BrowserWindow {
|
||||||
page: "plugins-github",
|
page: "plugins-github",
|
||||||
component: `<plugins-github></plugins-github>`,
|
component: `<plugins-github></plugins-github>`,
|
||||||
condition: `page == 'plugins-github'`
|
condition: `page == 'plugins-github'`
|
||||||
}, {
|
|
||||||
page: "podcasts",
|
|
||||||
component: `<apple-podcasts></apple-podcasts>`,
|
|
||||||
condition: `page == 'podcasts'`
|
|
||||||
}, {
|
}, {
|
||||||
page: "remote-pair",
|
page: "remote-pair",
|
||||||
component: `<remote-pair></remote-pair>`,
|
component: `<remote-pair></remote-pair>`,
|
||||||
|
|
|
@ -336,6 +336,7 @@ const app = new Vue({
|
||||||
let buttonPressDelay = 500
|
let buttonPressDelay = 500
|
||||||
let stickDeadZone = 0.2
|
let stickDeadZone = 0.2
|
||||||
let scrollGroup = null
|
let scrollGroup = null
|
||||||
|
let scrollGroupY = null
|
||||||
|
|
||||||
let cursorSpeed = cursorSpeedPvt
|
let cursorSpeed = cursorSpeedPvt
|
||||||
|
|
||||||
|
@ -374,13 +375,16 @@ const app = new Vue({
|
||||||
}
|
}
|
||||||
|
|
||||||
// RIGHT STICK.
|
// RIGHT STICK.
|
||||||
if (gp.axes[3] > stickDeadZone) {
|
if(scrollGroupY) {
|
||||||
$("#app-content").scrollTop($("#app-content").scrollTop() + (gp.axes[3] * scrollSpeed))
|
if (gp.axes[3] > stickDeadZone) {
|
||||||
} else if (gp.axes[3] < -stickDeadZone) {
|
$(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
|
||||||
$("#app-content").scrollTop($("#app-content").scrollTop() + (gp.axes[3] * scrollSpeed))
|
} else if (gp.axes[3] < -stickDeadZone) {
|
||||||
|
$(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (scrollGroup) {
|
if (scrollGroup) {
|
||||||
if (gp.axes[2] > stickDeadZone) {
|
if (gp.axes[2] > stickDeadZone) {
|
||||||
console.log('axis 2 up')
|
console.log('axis 2 up')
|
||||||
|
@ -472,6 +476,15 @@ const app = new Vue({
|
||||||
|
|
||||||
if (element) {
|
if (element) {
|
||||||
let closest = element.closest("[tabindex], input, button, a")
|
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")
|
let scrollGroupClo = element.closest(".v-hl-container")
|
||||||
|
|
||||||
if (scrollGroupClo) {
|
if (scrollGroupClo) {
|
||||||
|
|
|
@ -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">
|
<div id="navigation-bar">
|
||||||
<button class="nav-item" @click="navigateBack()">
|
<button class="nav-item" @click="navigateBack()">
|
||||||
<%- include('../svg/chevron-left.svg') %>
|
<%- include('../svg/chevron-left.svg') %>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="app-sidebar-content">
|
<div class="app-sidebar-content" scrollaxis="y">
|
||||||
<div class="app-sidebar-header-text">
|
<div class="app-sidebar-header-text">
|
||||||
{{$root.getLz('app.name')}}
|
{{$root.getLz('app.name')}}
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue