Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/renderer/components/PlayerSettings/PlayerSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
:value="defaultViewingMode"
:select-names="viewingModeNames"
:select-values="viewingModeValues"
:tooltip="t('Settings.Player Settings.Default Viewing Mode.Tooltip')"
:icon="['fas', 'expand']"
@change="updateDefaultViewingMode"
/>
Expand Down Expand Up @@ -405,10 +406,12 @@ const viewingModeNames = computed(() => {
t('Settings.General Settings.Thumbnail Preference.Default'),
t('Settings.Player Settings.Default Viewing Mode.Theater'),
t('Video.Player.Full Window'),
t('Settings.Player Settings.Default Viewing Mode.Full Window (Always On)'),

...process.env.IS_ELECTRON
? [
t('Settings.Player Settings.Default Viewing Mode.Full Screen'),
t('Settings.Player Settings.Default Viewing Mode.Full Screen (Always On)'),
t('Settings.Player Settings.Default Viewing Mode.Picture in Picture')
]
: []
Expand All @@ -428,9 +431,14 @@ const viewingModeValues = computed(() => {
'default',
'theatre',
'fullwindow',
'fullwindow_always_on',

...process.env.IS_ELECTRON
? ['fullscreen', 'pip']
? [
'fullscreen',
'fullscreen_always_on',
'pip',
]
: []
]

Expand Down
14 changes: 14 additions & 0 deletions src/renderer/views/Watch/Watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ export default defineComponent({

this.checkIfTimestamp()
this.checkIfPlaylist()
this.setViewingModeOnRouteChange()

switch (this.backendPreference) {
case 'local':
Expand Down Expand Up @@ -460,16 +461,29 @@ export default defineComponent({
this.useTheatreMode = this.theatrePossible
break
case 'fullscreen':
case 'fullscreen_always_on':
this.startNextVideoInFullscreen = true
break
case 'fullwindow':
case 'fullwindow_always_on':
this.startNextVideoInFullwindow = true
break
case 'pip':
this.startNextVideoInPip = true
}
},

setViewingModeOnRouteChange: function () {
switch (this.defaultViewingMode) {
case 'fullscreen_always_on':
this.startNextVideoInFullscreen = true
break
case 'fullwindow_always_on':
this.startNextVideoInFullwindow = true
break
}
},

changeTimestamp: function (timestamp) {
const player = this.$refs.player

Expand Down
3 changes: 3 additions & 0 deletions static/locales/en-US.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,9 @@ Settings:
Full Screen: Full Screen
Picture in Picture: Picture in Picture
External Player: External Player ({externalPlayerName})
Full Window (Always On): Full Window (Always On)
Full Screen (Always On): Full Screen (Always On)
Tooltip: Most default viewing modes are only applied when switching to watch page (e.g. playing another video in a playlist won't be applied selected view mode again). Those modes with '(Always On)' are applied every time.

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc Jun 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe something like this?

Suggested change
Tooltip: Most default viewing modes are only applied when switching to watch page (e.g. playing another video in a playlist won't be applied selected view mode again). Those modes with '(Always On)' are applied every time.
Tooltip: Most default viewing modes are only applied at the start of each watch session. Changes made during the session persist until it ends. Always-on viewing modes remain active throughout the watch session.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most default viewing modes are only applied at the start of each watch session. Changes made during the session persist until it ends. part looks ok
Always-on viewing modes remain active throughout the watch session. not so much coz "remain active" read strange (like you can't turn it off)
I think the text should explain that those modes makes full window/screen applied when switched to a new video regardless of whatever mode change made when viewing previous video and not sure how to make the text short :)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about this
Always-on viewing modes are applied whenever you switch to a new video, regardless of any viewing mode changes made during the previous video

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated take a look

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! What about the first part change i suggested, want to keep it like that or alter it?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forgot to change that too, updated

Scroll Volume Over Video Player: Scroll Volume Over Video Player
Scroll Playback Rate Over Video Player: Scroll Playback Rate Over Video Player
Skip by Scrolling Over Video Player: Skip by Scrolling Over Video Player
Expand Down