mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

osc: move volume left of fullscreen button

Browse Source
This commit is contained in:
Ricardo Constantino 2017-04-17 20:44:19 +01:00
parent fe937e866d
commit 9d6c208afa
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
player/lua/osc.lua
View File

@ -1245,12 +1245,6 @@ layouts["bottombar"] = function()
lo.geometry = geo lo.geometry = geo
lo.style = osc_styles.smallButtonsBar lo.style = osc_styles.smallButtonsBar
-- Volume
geo = { x = geo.x + geo.w + padX, y = geo.y, an = geo.an, w = geo.w, h = geo.h }
lo = add_layout("volume")
lo.geometry = geo
lo.style = osc_styles.smallButtonsBar
-- Left timecode -- Left timecode
geo = { x = geo.x + geo.w + padX + tcW, y = geo.y, an = 6, geo = { x = geo.x + geo.w + padX + tcW, y = geo.y, an = 6,
w = tcW, h = geo.h } w = tcW, h = geo.h }
@ -1267,8 +1261,14 @@ layouts["bottombar"] = function()
lo.geometry = geo lo.geometry = geo
lo.style = osc_styles.smallButtonsBar lo.style = osc_styles.smallButtonsBar
-- Volume
geo = { x = geo.x - geo.w - padX, y = geo.y, an = geo.an, w = geo.w, h = geo.h }
lo = add_layout("volume")
lo.geometry = geo
lo.style = osc_styles.smallButtonsBar
-- Track selection buttons -- Track selection buttons
geo = { x = geo.x - geo.w - padX, y = geo.y, an = geo.an, w = tsW, h = geo.h } geo = { x = geo.x - tsW - padX, y = geo.y, an = geo.an, w = tsW, h = geo.h }
lo = add_layout("cy_sub") lo = add_layout("cy_sub")
lo.geometry = geo lo.geometry = geo
lo.style = osc_styles.smallButtonsBar lo.style = osc_styles.smallButtonsBar
@ -1280,7 +1280,7 @@ layouts["bottombar"] = function()
-- Right timecode -- Right timecode
geo = { x = geo.x - geo.w - padX - tcW - 10, y = geo.y, an = 4, geo = { x = geo.x - padX - tcW - 10, y = geo.y, an = geo.an,
w = tcW, h = geo.h } w = tcW, h = geo.h }
lo = add_layout("tc_right") lo = add_layout("tc_right")
lo.geometry = geo lo.geometry = geo
@ -1378,12 +1378,6 @@ layouts["topbar"] = function()
lo.geometry = geo lo.geometry = geo
lo.style = osc_styles.smallButtonsBar lo.style = osc_styles.smallButtonsBar
-- Volume
geo = { x = geo.x + geo.w + padX, y = geo.y, an = geo.an, w = geo.w, h = geo.h }
lo = add_layout("volume")
lo.geometry = geo
lo.style = osc_styles.smallButtonsBar
-- Left timecode -- Left timecode
geo = { x = geo.x + geo.w + padX + tcW, y = geo.y, an = 6, geo = { x = geo.x + geo.w + padX + tcW, y = geo.y, an = 6,
@ -1394,14 +1388,21 @@ layouts["topbar"] = function()
local sb_l = geo.x + padX local sb_l = geo.x + padX
geo = { x = osc_geo.x + osc_geo.w - padX, y = geo.y, an = geo.an, -- Fullscreen button
geo = { x = osc_geo.x + osc_geo.w - buttonW - padX, y = geo.y, an = 4,
w = buttonW, h = geo.h } w = buttonW, h = geo.h }
lo = add_layout("tog_fs") lo = add_layout("tog_fs")
lo.geometry = geo lo.geometry = geo
lo.style = osc_styles.smallButtonsBar lo.style = osc_styles.smallButtonsBar
-- Volume
geo = { x = geo.x - geo.w - padX, y = geo.y, an = geo.an, w = geo.w, h = geo.h }
lo = add_layout("volume")
lo.geometry = geo
lo.style = osc_styles.smallButtonsBar
-- Track selection buttons -- Track selection buttons
geo = { x = geo.x - geo.w - padX, y = geo.y, an = geo.an, w = tsW, h = geo.h } geo = { x = geo.x - tsW - padX, y = geo.y, an = geo.an, w = tsW, h = geo.h }
lo = add_layout("cy_sub") lo = add_layout("cy_sub")
lo.geometry = geo lo.geometry = geo
lo.style = osc_styles.smallButtonsBar lo.style = osc_styles.smallButtonsBar