mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-06 03:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4027 from neurokitti/fix-workspace-swaping-issues

Browse Source
This commit is contained in:
mr. m
2025-01-01 18:52:36 +01:00
committed by GitHub
parent 1c3f55568b d9748cb69b
commit c0d83be019
1 changed files with 26 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/browser/base/zen-components/ZenWorkspaces.mjs
View File

@@ -117,14 +117,16 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
return; return;
} }
const direction = this.naturalScroll ? -1 : 1;
// event is forward or back
switch (event.command) { switch (event.command) {
case "Forward": case "Forward":
this.changeWorkspaceShortcut(1); this.changeWorkspaceShortcut(1 * direction);
event.stopImmediatePropagation(); event.stopImmediatePropagation();
event.preventDefault(); event.preventDefault();
break; break;
case "Back": case "Back":
this.changeWorkspaceShortcut(-1); this.changeWorkspaceShortcut(-1 * direction);
event.stopImmediatePropagation(); event.stopImmediatePropagation();
event.preventDefault(); event.preventDefault();
break; break;
@@ -177,29 +179,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
if (Math.abs(delta) < scrollThreshold) return; if (Math.abs(delta) < scrollThreshold) return;
// Determine scroll direction // Determine scroll direction
let direction = delta > 0 ? 1 : -1; let rawDirection = delta > 0 ? 1 : -1;
if (this.naturalScroll) {
direction = delta > 0 ? -1 : 1;
}
// Workspace logic let direction = this.naturalScroll ? -1 : 1;
const workspaces = (await this._workspaces()).workspaces; this.changeWorkspaceShortcut(rawDirection * direction);
const currentIndex = workspaces.findIndex(w => w.uuid === this.activeWorkspace);
if (currentIndex === -1) return; // No valid current workspace
let targetIndex = currentIndex + direction;
if (this.shouldWrapAroundNavigation) {
// Add length to handle negative indices and loop
targetIndex = (targetIndex + workspaces.length) % workspaces.length;
} else {
// Clamp within bounds to disable looping
targetIndex = Math.max(0, Math.min(workspaces.length - 1, targetIndex));
}
if (targetIndex !== currentIndex) {
await this.changeWorkspace(workspaces[targetIndex]);
}
this._lastScrollTime = currentTime; this._lastScrollTime = currentTime;
}, { passive: true }); }, { passive: true });
@@ -265,42 +248,21 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
// Determine swipe direction based on cumulative delta // Determine swipe direction based on cumulative delta
if (Math.abs(this._swipeState.cumulativeDelta) > 0.25) { if (Math.abs(this._swipeState.cumulativeDelta) > 0.25) {
this._swipeState.direction = this._swipeState.cumulativeDelta > 0 ? 'left' : 'right'; this._swipeState.direction = this._swipeState.cumulativeDelta > 0 ? 'left' : 'right';
if (this.naturalScroll){
this._swipeState.direction = this._swipeState.cumulativeDelta > 0 ? 'right' : 'left';
}
} }
} }
async _handleSwipeEnd(event) { async _handleSwipeEnd(event) {
if (!this.workspaceEnabled || !this._swipeState?.isGestureActive) return; if (!this.workspaceEnabled || !this._swipeState?.isGestureActive) return;
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
const isRTL = document.documentElement.matches(':-moz-locale-dir(rtl)');
const moveForward = (this._swipeState.direction === 'right') !== isRTL;
let rawDirection = moveForward ? 1 : -1;
if (this._swipeState.direction) { if (this._swipeState.direction) {
const workspaces = (await this._workspaces()).workspaces;
const currentIndex = workspaces.findIndex(w => w.uuid === this.activeWorkspace); let direction = this.naturalScroll ? -1 : 1;
this.changeWorkspaceShortcut(rawDirection * direction);
if (currentIndex !== -1) {
const isRTL = document.documentElement.matches(':-moz-locale-dir(rtl)');
const moveForward = (this._swipeState.direction === 'right') !== isRTL;
let targetIndex = moveForward
? currentIndex + 1
: currentIndex - 1;
if (this.shouldWrapAroundNavigation) {
// Add length to handle negative indices and clamp within bounds
targetIndex = (targetIndex + workspaces.length) % workspaces.length;
} else {
// Clamp within bounds for to remove looping
targetIndex = Math.max(0, Math.min(workspaces.length - 1, targetIndex));
}
if (targetIndex !== currentIndex) {
await this.changeWorkspace(workspaces[targetIndex]);
}
}
} }
// Reset swipe state // Reset swipe state
@@ -1580,14 +1542,23 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
await this.openEditDialog(this._contextMenuId); await this.openEditDialog(this._contextMenuId);
} }
async changeWorkspaceShortcut(offset = 1) { async changeWorkspaceShortcut(offset = 1){
// Cycle through workspaces // Cycle through workspaces
let workspaces = await this._workspaces(); let workspaces = await this._workspaces();
let activeWorkspace = await this.getActiveWorkspace(); let activeWorkspace = await this.getActiveWorkspace();
let workspaceIndex = workspaces.workspaces.indexOf(activeWorkspace); let workspaceIndex = workspaces.workspaces.indexOf(activeWorkspace);
// note: offset can be negative // note: offset can be negative
let nextWorkspace = let targetIndex = workspaceIndex + offset;
workspaces.workspaces[(workspaceIndex + offset + workspaces.workspaces.length) % workspaces.workspaces.length]; if (this.shouldWrapAroundNavigation) {
// Add length to handle negative indices and loop
targetIndex = (targetIndex + workspaces.workspaces.length) % workspaces.workspaces.length;
} else {
// Clamp within bounds to disable looping
targetIndex = Math.max(0, Math.min(workspaces.workspaces.length - 1, targetIndex));
}
let nextWorkspace = workspaces.workspaces[(targetIndex)];
await this.changeWorkspace(nextWorkspace); await this.changeWorkspace(nextWorkspace);
} }