1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-08 00:10:00 +02:00

Merge branch 'dev' into update-ff-138

Signed-off-by: mr. m  <91018726+mauro-balades@users.noreply.github.com>
This commit is contained in:
mr. m 2025-04-19 16:21:40 +02:00 committed by GitHub
commit c153bef170
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 9 deletions

View file

@ -85,7 +85,7 @@ winget install --id Zen-Team.Zen-Browser
You can also install Zen using Homebrew: You can also install Zen using Homebrew:
``` ```
brew install --cask zen-browser brew install zen-browser
``` ```
#### Linux #### Linux
@ -118,11 +118,11 @@ To upgrade the browser to a newer version, use the embedded update functionality
## 👨‍💻 Development and Contributing ## 👨‍💻 Development and Contributing
Some components used by @zen-browser as an attempt to make firefox forks a better place, and for other to enjoy the beauty of OSS. You can find them [here](https://github.com/zen-browser/desktop/tree/dev/src/browser/base/zen-components). Some components used by @zen-browser as an attempt to make firefox forks a better place, and for other to enjoy the beauty of OSS. You can find them [here](https://github.com/zen-browser/desktop/tree/dev/src/zen).
#### `Run Locally` #### `Run Locally`
In order to download and run Zen locally, please follow [these instructions](https://docs.zen-browser.app/building). In order to download and run Zen locally, please follow [these instructions](https://docs.zen-browser.app/guides/building).
#### `Special Thanks` #### `Special Thanks`

View file

@ -472,4 +472,5 @@ pref("layers.gpu-process.enabled", true);
// Picture-in-picture // Picture-in-picture
pref("media.videocontrols.picture-in-picture.video-toggle.enabled", true); pref("media.videocontrols.picture-in-picture.video-toggle.enabled", true);
pref("media.videocontrols.picture-in-picture.enable-when-switching-tabs.enabled", true); // TODO: Enable once we have a proper settings page
pref("media.videocontrols.picture-in-picture.enable-when-switching-tabs.enabled", false);

View file

@ -1024,4 +1024,9 @@ Preferences.addAll([
type: 'bool', type: 'bool',
default: true, default: true,
}, },
{
id: 'media.videocontrols.picture-in-picture.enabled',
type: 'bool',
default: true,
},
]); ]);

View file

@ -110,9 +110,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
); );
} }
selectEmptyTab(newTabTarget = null) { selectEmptyTab(newTabTarget = null, selectURLBar = true) {
if (this._emptyTab && gZenVerticalTabsManager._canReplaceNewTab) { if (this._emptyTab && gZenVerticalTabsManager._canReplaceNewTab) {
if (gBrowser.selectedTab !== this._emptyTab) { if (gBrowser.selectedTab !== this._emptyTab && selectURLBar) {
window.addEventListener( window.addEventListener(
'TabSelect', 'TabSelect',
() => { () => {
@ -1745,7 +1745,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
!onInit !onInit
) { ) {
prevTabUsed = gBrowser.selectedTab; prevTabUsed = gBrowser.selectedTab;
this.selectEmptyTab(); this.selectEmptyTab(null, false);
} }
for (const tab of hiddenTabs) { for (const tab of hiddenTabs) {
gBrowser.hideTab(tab, undefined, true); gBrowser.hideTab(tab, undefined, true);

View file

@ -19,7 +19,7 @@
"brandShortName": "Zen", "brandShortName": "Zen",
"brandFullName": "Zen Browser", "brandFullName": "Zen Browser",
"release": { "release": {
"displayVersion": "1.11.4b", "displayVersion": "1.11.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.11.4t", "displayVersion": "1.11.5t",
"github": { "github": {
"repo": "zen-browser/desktop" "repo": "zen-browser/desktop"
} }