forked from ZenBrowserMirrors/zen-desktop
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
This commit is contained in:
commit
f3ff74b0df
5 changed files with 24 additions and 6 deletions
|
@ -6,7 +6,7 @@
|
||||||
[](https://crowdin.com/project/zen-browser)
|
[](https://crowdin.com/project/zen-browser)
|
||||||
[](https://github.com/zen-browser/desktop/actions/workflows/build.yml)
|
[](https://github.com/zen-browser/desktop/actions/workflows/build.yml)
|
||||||
|
|
||||||
✨ Experience tranquillity while browsing the web without people tracking you! Zen is a privacy-focused browser that blocks trackers, ads, and other unwanted content while offering the best browsing experience!
|
✨ Experience tranquillity while browsing the internet with Zen! Our mission is to give you a balance between speed, privacy and productivity!
|
||||||
|
|
||||||
<div flex="true">
|
<div flex="true">
|
||||||
<a href="https://zen-browser.app/download">
|
<a href="https://zen-browser.app/download">
|
||||||
|
|
|
@ -111,7 +111,7 @@
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
cursor: ew-resize;
|
cursor: ew-resize;
|
||||||
z-index: 2;
|
z-index: 3;
|
||||||
|
|
||||||
&:is(.zen-split-view-splitter[orient='vertical']) {
|
&:is(.zen-split-view-splitter[orient='vertical']) {
|
||||||
/* Bit of a hacky solution, but it works */
|
/* Bit of a hacky solution, but it works */
|
||||||
|
|
|
@ -72,7 +72,6 @@
|
||||||
&:has(toolbarbutton:hover) toolbarbutton[active='true'] {
|
&:has(toolbarbutton:hover) toolbarbutton[active='true'] {
|
||||||
&:not(:hover) {
|
&:not(:hover) {
|
||||||
width: min(var(--zen-overflowed-workspace-button-width), 25px);
|
width: min(var(--zen-overflowed-workspace-button-width), 25px);
|
||||||
min-width: 10px;
|
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
content: '';
|
content: '';
|
||||||
|
|
|
@ -221,6 +221,8 @@ class ZenMediaController {
|
||||||
|
|
||||||
this._currentPosition = positionState.position;
|
this._currentPosition = positionState.position;
|
||||||
this._currentDuration = positionState.duration;
|
this._currentDuration = positionState.duration;
|
||||||
|
this._currentPlaybackRate = positionState.playbackRate;
|
||||||
|
|
||||||
this.updateMediaPosition();
|
this.updateMediaPosition();
|
||||||
|
|
||||||
for (const key of this.supportedKeys) {
|
for (const key of this.supportedKeys) {
|
||||||
|
@ -297,6 +299,8 @@ class ZenMediaController {
|
||||||
|
|
||||||
this._currentPosition = event.position;
|
this._currentPosition = event.position;
|
||||||
this._currentDuration = event.duration;
|
this._currentDuration = event.duration;
|
||||||
|
this._currentPlaybackRate = event.playbackRate;
|
||||||
|
|
||||||
this.updateMediaPosition();
|
this.updateMediaPosition();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -357,7 +361,7 @@ class ZenMediaController {
|
||||||
|
|
||||||
this._mediaUpdateInterval = setInterval(() => {
|
this._mediaUpdateInterval = setInterval(() => {
|
||||||
if (this._currentMediaController?.isPlaying) {
|
if (this._currentMediaController?.isPlaying) {
|
||||||
this._currentPosition += 1;
|
this._currentPosition += 1 * this._currentPlaybackRate;
|
||||||
if (this._currentPosition > this._currentDuration) {
|
if (this._currentPosition > this._currentDuration) {
|
||||||
this._currentPosition = this._currentDuration;
|
this._currentPosition = this._currentDuration;
|
||||||
}
|
}
|
||||||
|
@ -392,6 +396,13 @@ class ZenMediaController {
|
||||||
const metadata = event.target.getMetadata();
|
const metadata = event.target.getMetadata();
|
||||||
this.mediaTitle.textContent = metadata.title || '';
|
this.mediaTitle.textContent = metadata.title || '';
|
||||||
this.mediaArtist.textContent = metadata.artist || '';
|
this.mediaArtist.textContent = metadata.artist || '';
|
||||||
|
|
||||||
|
const mediaInfoElements = [this.mediaTitle, this.mediaArtist];
|
||||||
|
for (const element of mediaInfoElements) {
|
||||||
|
element.removeAttribute('overflow');
|
||||||
|
}
|
||||||
|
|
||||||
|
this.addLabelOverflows(mediaInfoElements);
|
||||||
}
|
}
|
||||||
|
|
||||||
_onPictureInPictureModeChange(event) {
|
_onPictureInPictureModeChange(event) {
|
||||||
|
|
|
@ -1,8 +1,16 @@
|
||||||
diff --git a/toolkit/components/pictureinpicture/content/player.xhtml b/toolkit/components/pictureinpicture/content/player.xhtml
|
diff --git a/toolkit/components/pictureinpicture/content/player.xhtml b/toolkit/components/pictureinpicture/content/player.xhtml
|
||||||
index 440ce51e8e67e4d3a7bdcb78f38f2fb6684c9848..6b48a3178f9de460dd3b08728f5638ef2751de21 100644
|
index 440ce51e8e67e4d3a7bdcb78f38f2fb6684c9848..38912579310314a13d516328ec770db6b589d243 100644
|
||||||
--- a/toolkit/components/pictureinpicture/content/player.xhtml
|
--- a/toolkit/components/pictureinpicture/content/player.xhtml
|
||||||
+++ b/toolkit/components/pictureinpicture/content/player.xhtml
|
+++ b/toolkit/components/pictureinpicture/content/player.xhtml
|
||||||
@@ -52,13 +52,22 @@
|
@@ -17,6 +17,7 @@
|
||||||
|
<link rel="localization" href="browser/browserSets.ftl"/>
|
||||||
|
<script src="chrome://global/content/pictureinpicture/player.js"></script>
|
||||||
|
<title data-l10n-id="pictureinpicture-player-title"></title>
|
||||||
|
+ <link rel="localization" href="browser/zen-general.ftl"/>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
@@ -52,13 +53,22 @@
|
||||||
tabindex="10"
|
tabindex="10"
|
||||||
#endif
|
#endif
|
||||||
/>
|
/>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue