Fix rate UX for new design

This commit is contained in:
Feross Aboukhadijeh
2016-05-23 14:47:02 -07:00
parent 279c621d23
commit b4bb9a6603
3 changed files with 24 additions and 30 deletions

View File

@@ -134,10 +134,10 @@ function onPlayerOpen () {
getMenuItem('Increase Volume').enabled = true getMenuItem('Increase Volume').enabled = true
getMenuItem('Decrease Volume').enabled = true getMenuItem('Decrease Volume').enabled = true
getMenuItem('Add Subtitles File...').enabled = true getMenuItem('Add Subtitles File...').enabled = true
getMenuItem('Skip forward 10 seconds').enabled = true getMenuItem('Step Forward').enabled = true
getMenuItem('Skip back 10 seconds').enabled = true getMenuItem('Step Backward').enabled = true
getMenuItem('Increase video speed').enabled = true getMenuItem('Increase Speed').enabled = true
getMenuItem('Decrease video speed').enabled = true getMenuItem('Decrease Speed').enabled = true
} }
function onPlayerClose () { function onPlayerClose () {
@@ -146,10 +146,10 @@ function onPlayerClose () {
getMenuItem('Increase Volume').enabled = false getMenuItem('Increase Volume').enabled = false
getMenuItem('Decrease Volume').enabled = false getMenuItem('Decrease Volume').enabled = false
getMenuItem('Add Subtitles File...').enabled = false getMenuItem('Add Subtitles File...').enabled = false
getMenuItem('Skip forward 10 seconds').enabled = false getMenuItem('Step Forward').enabled = false
getMenuItem('Skip back 10 seconds').enabled = false getMenuItem('Step Backward').enabled = false
getMenuItem('Increase video speed').enabled = false getMenuItem('Increase Speed').enabled = false
getMenuItem('Decrease video speed').enabled = false getMenuItem('Decrease Speed').enabled = false
} }
function onToggleFullScreen (isFullScreen) { function onToggleFullScreen (isFullScreen) {
@@ -340,21 +340,13 @@ function getAppMenuTemplate () {
type: 'separator' type: 'separator'
}, },
{ {
label: 'Add Subtitles File...', label: 'Step Forward',
click: openSubtitles,
enabled: false
},
{
type: 'separator'
},
{
label: 'Skip forward 10 seconds',
accelerator: 'CmdOrCtrl+Alt+Right', accelerator: 'CmdOrCtrl+Alt+Right',
click: skipForward, click: skipForward,
enabled: false enabled: false
}, },
{ {
label: 'Skip back 10 seconds', label: 'Step Backward',
accelerator: 'CmdOrCtrl+Alt+Left', accelerator: 'CmdOrCtrl+Alt+Left',
click: skipBack, click: skipBack,
enabled: false enabled: false
@@ -363,16 +355,24 @@ function getAppMenuTemplate () {
type: 'separator' type: 'separator'
}, },
{ {
label: 'Increase video speed', label: 'Increase Speed',
accelerator: 'CmdOrCtrl+plus', accelerator: 'CmdOrCtrl+=',
click: increasePlaybackRate, click: increasePlaybackRate,
enabled: false enabled: false
}, },
{ {
label: 'Decrease video speed', label: 'Decrease Speed',
accelerator: 'CmdOrCtrl+-', accelerator: 'CmdOrCtrl+-',
click: decreasePlaybackRate, click: decreasePlaybackRate,
enabled: false enabled: false
},
{
type: 'separator'
},
{
label: 'Add Subtitles File...',
click: openSubtitles,
enabled: false
} }
] ]
}, },

View File

@@ -739,7 +739,8 @@ body.drag .app::after {
vertical-align: sub; vertical-align: sub;
} }
.player .controls .time { .player .controls .time,
.player .controls .rate {
font-weight: 100; font-weight: 100;
font-size: 13px; font-size: 13px;
margin: 9px 8px 8px 8px; margin: 9px 8px 8px 8px;
@@ -819,13 +820,6 @@ body.drag .app::after {
color: #9af; color: #9af;
} }
.player-controls .rate {
display: inline;
height: 30px;
padding: 5px;
margin-left: 20px;
}
.player .controls .volume-slider::-webkit-slider-thumb { .player .controls .volume-slider::-webkit-slider-thumb {
-webkit-appearance: none; -webkit-appearance: none;
-webkit-app-region: no-drag; -webkit-app-region: no-drag;

View File

@@ -452,7 +452,7 @@ function renderPlayerControls (state) {
if (state.playing.playbackRate !== 1) { if (state.playing.playbackRate !== 1) {
elements.push(hx` elements.push(hx`
<span class='rate float-left'> <span class='rate float-left'>
speed: ${state.playing.playbackRate}X ${state.playing.playbackRate}x
</span> </span>
`) `)
} }