mirror of
https://github.com/zen-browser/desktop.git
synced 2025-09-06 19:38:24 +00:00
Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
434066aa6f | ||
![]() |
1c5044b90d | ||
![]() |
407fc98930 | ||
![]() |
8bd7f187a3 | ||
![]() |
798c5f8d85 | ||
![]() |
aefe74e934 |
@@ -1 +0,0 @@
|
|||||||
https://zen-browser.app/funding.json
|
|
@@ -21,8 +21,6 @@ finish-args:
|
|||||||
- --socket=cups
|
- --socket=cups
|
||||||
- --persist=.zen
|
- --persist=.zen
|
||||||
- --env=DICPATH=/usr/share/hunspell
|
- --env=DICPATH=/usr/share/hunspell
|
||||||
- --filesystem=xdg-data/applications:create
|
|
||||||
- --filesystem=xdg-data/icons:create
|
|
||||||
- --filesystem=xdg-download:rw
|
- --filesystem=xdg-download:rw
|
||||||
- --filesystem=/run/.heim_org.h5l.kcm-socket
|
- --filesystem=/run/.heim_org.h5l.kcm-socket
|
||||||
- --filesystem=xdg-run/speech-dispatcher:ro
|
- --filesystem=xdg-run/speech-dispatcher:ro
|
||||||
|
@@ -36,6 +36,9 @@
|
|||||||
value: '@cond'
|
value: '@cond'
|
||||||
condition: '!defined(MOZILLA_OFFICIAL)' # Section: Pinned tabs management
|
condition: '!defined(MOZILLA_OFFICIAL)' # Section: Pinned tabs management
|
||||||
|
|
||||||
|
- name: zen.pinned-tab-manager.wheel-close-if-pending
|
||||||
|
value: true
|
||||||
|
|
||||||
- name: zen.pinned-tab-manager.debug
|
- name: zen.pinned-tab-manager.debug
|
||||||
value: false
|
value: false
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
|
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
|
||||||
index e2b27db6c13278defea3bcc7606a8da54e7d001c..3033f5c98c94cf4b048432dfee72e20f4d8e37b6 100644
|
index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa24888de67ccb 100644
|
||||||
--- a/browser/components/tabbrowser/content/tabs.js
|
--- a/browser/components/tabbrowser/content/tabs.js
|
||||||
+++ b/browser/components/tabbrowser/content/tabs.js
|
+++ b/browser/components/tabbrowser/content/tabs.js
|
||||||
@@ -332,7 +332,7 @@
|
@@ -332,7 +332,7 @@
|
||||||
@@ -7,7 +7,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..3033f5c98c94cf4b048432dfee72e20f
|
|||||||
if (
|
if (
|
||||||
event.button != 0 ||
|
event.button != 0 ||
|
||||||
- event.target != this.arrowScrollbox ||
|
- event.target != this.arrowScrollbox ||
|
||||||
+ !event.target.classList.contains("zen-workspace-normal-tabs-section") ||
|
+ !event.target.classList.contains("zen-workspace-empty-space") ||
|
||||||
event.composedTarget.localName == "toolbarbutton"
|
event.composedTarget.localName == "toolbarbutton"
|
||||||
) {
|
) {
|
||||||
return;
|
return;
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
box-shadow: var(--zen-big-shadow);
|
box-shadow: var(--zen-big-shadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
& browser[transparent='true'] {
|
& browser[type='content'] {
|
||||||
background: light-dark(rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1));
|
background: light-dark(rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -875,7 +875,9 @@
|
|||||||
// that we want it to initially be collapsed.
|
// that we want it to initially be collapsed.
|
||||||
setTimeout(
|
setTimeout(
|
||||||
(folder) => {
|
(folder) => {
|
||||||
|
gZenPinnedTabManager.promiseInitializedPinned.then(() => {
|
||||||
folder.collapsed = !!options.collapsed;
|
folder.collapsed = !!options.collapsed;
|
||||||
|
});
|
||||||
},
|
},
|
||||||
0,
|
0,
|
||||||
folder
|
folder
|
||||||
|
@@ -69,6 +69,9 @@
|
|||||||
MAX_ESSENTIALS_TABS = 12;
|
MAX_ESSENTIALS_TABS = 12;
|
||||||
|
|
||||||
#hasInitializedPins = false;
|
#hasInitializedPins = false;
|
||||||
|
promiseInitializedPinned = new Promise((resolve) => {
|
||||||
|
this._resolvePinnedInitializedInternal = resolve;
|
||||||
|
});
|
||||||
|
|
||||||
async init() {
|
async init() {
|
||||||
if (!this.enabled) {
|
if (!this.enabled) {
|
||||||
@@ -187,10 +190,16 @@
|
|||||||
return this._pinsCache;
|
return this._pinsCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#finishedInitializingPins() {
|
||||||
|
this._resolvePinnedInitializedInternal();
|
||||||
|
delete this._resolvePinnedInitializedInternal;
|
||||||
|
this.#hasInitializedPins = true;
|
||||||
|
}
|
||||||
|
|
||||||
async #initializePinnedTabs(init = false) {
|
async #initializePinnedTabs(init = false) {
|
||||||
const pins = this._pinsCache;
|
const pins = this._pinsCache;
|
||||||
if (!pins?.length || !init) {
|
if (!pins?.length || !init) {
|
||||||
this.#hasInitializedPins = true;
|
this.#finishedInitializingPins();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -374,7 +383,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.#hasInitializedPins = true;
|
this.#finishedInitializingPins();
|
||||||
}, 0);
|
}, 0);
|
||||||
|
|
||||||
gBrowser._updateTabBarForPinnedTabs();
|
gBrowser._updateTabBarForPinnedTabs();
|
||||||
@@ -606,7 +615,11 @@
|
|||||||
async _onTabClick(e) {
|
async _onTabClick(e) {
|
||||||
const tab = e.target?.closest('tab');
|
const tab = e.target?.closest('tab');
|
||||||
if (e.button === 1 && tab) {
|
if (e.button === 1 && tab) {
|
||||||
await this._onCloseTabShortcut(e, tab, { closeIfPending: true });
|
await this._onCloseTabShortcut(e, tab, {
|
||||||
|
closeIfPending: Services.prefs.getBoolPref(
|
||||||
|
'zen.pinned-tab-manager.wheel-close-if-pending'
|
||||||
|
),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -678,6 +691,7 @@
|
|||||||
workspaceUuid: tab.getAttribute('zen-workspace-id'),
|
workspaceUuid: tab.getAttribute('zen-workspace-id'),
|
||||||
isEssential: tab.getAttribute('zen-essential') === 'true',
|
isEssential: tab.getAttribute('zen-essential') === 'true',
|
||||||
parentUuid: tab.group?.getAttribute('zen-pin-id') || null,
|
parentUuid: tab.group?.getAttribute('zen-pin-id') || null,
|
||||||
|
position: tab._pPos,
|
||||||
});
|
});
|
||||||
|
|
||||||
tab.setAttribute('zen-pin-id', uuid);
|
tab.setAttribute('zen-pin-id', uuid);
|
||||||
|
@@ -926,7 +926,6 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
|
|||||||
await this.initializeTabsStripSections();
|
await this.initializeTabsStripSections();
|
||||||
this._initializeEmptyTab();
|
this._initializeEmptyTab();
|
||||||
await gZenPinnedTabManager.refreshPinnedTabs({ init: true });
|
await gZenPinnedTabManager.refreshPinnedTabs({ init: true });
|
||||||
this._invalidateBookmarkContainers();
|
|
||||||
await this.changeWorkspace(activeWorkspace, { onInit: true });
|
await this.changeWorkspace(activeWorkspace, { onInit: true });
|
||||||
this.#fixTabPositions();
|
this.#fixTabPositions();
|
||||||
this.onWindowResize();
|
this.onWindowResize();
|
||||||
@@ -1493,8 +1492,8 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
|
|||||||
if (container) {
|
if (container) {
|
||||||
if (tab.group?.hasAttribute('split-view-group')) {
|
if (tab.group?.hasAttribute('split-view-group')) {
|
||||||
gBrowser.zenHandleTabMove(tab.group, () => {
|
gBrowser.zenHandleTabMove(tab.group, () => {
|
||||||
for (const tab of tab.group.tabs) {
|
for (const subTab of tab.group.tabs) {
|
||||||
tab.setAttribute('zen-workspace-id', workspaceID);
|
subTab.setAttribute('zen-workspace-id', workspaceID);
|
||||||
}
|
}
|
||||||
container.insertBefore(tab.group, container.lastChild);
|
container.insertBefore(tab.group, container.lastChild);
|
||||||
});
|
});
|
||||||
|
@@ -19,7 +19,7 @@
|
|||||||
"brandShortName": "Zen",
|
"brandShortName": "Zen",
|
||||||
"brandFullName": "Zen Browser",
|
"brandFullName": "Zen Browser",
|
||||||
"release": {
|
"release": {
|
||||||
"displayVersion": "1.15.4b",
|
"displayVersion": "1.15.5b",
|
||||||
"github": {
|
"github": {
|
||||||
"repo": "zen-browser/desktop"
|
"repo": "zen-browser/desktop"
|
||||||
},
|
},
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
"brandShortName": "Twilight",
|
"brandShortName": "Twilight",
|
||||||
"brandFullName": "Zen Twilight",
|
"brandFullName": "Zen Twilight",
|
||||||
"release": {
|
"release": {
|
||||||
"displayVersion": "1.15t",
|
"displayVersion": "1.16t",
|
||||||
"github": {
|
"github": {
|
||||||
"repo": "zen-browser/desktop"
|
"repo": "zen-browser/desktop"
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user