diff options
| author |  Ricardo Constantino <wiiaboo@gmail.com> | 2017-04-17 20:44:19 +0100 |
|---|---|---|
| committer | Ricardo Constantino <wiiaboo@gmail.com> | 2017-04-19 20:18:23 +0100 |
| commit | 9d6c208afaa46392254cf493e4dc201d5bd0b42e (patch) | |
| tree | 61dc6e15767075fcc822fc887d254e4d6418026c /player | |
| parent | fe937e866d27c055161c2335e454d5b8d57dd4b2 (diff) | |
osc: move volume left of fullscreen button
Diffstat (limited to 'player')
| -rw-r--r-- | player/lua/osc.lua | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/player/lua/osc.lua b/player/lua/osc.lua index ea4682c5c7..ea77c1dfe0 100644 --- a/player/lua/osc.lua +++ b/player/lua/osc.lua @@ -1245,12 +1245,6 @@ layouts["bottombar"] = function() lo.geometry = geo 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 geo = { x = geo.x + geo.w + padX + tcW, y = geo.y, an = 6, w = tcW, h = geo.h } @@ -1267,8 +1261,14 @@ layouts["bottombar"] = function() lo.geometry = geo 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 - 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.geometry = geo lo.style = osc_styles.smallButtonsBar @@ -1280,7 +1280,7 @@ layouts["bottombar"] = function() -- 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 } lo = add_layout("tc_right") lo.geometry = geo @@ -1378,12 +1378,6 @@ layouts["topbar"] = function() lo.geometry = geo 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 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 - 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 } lo = add_layout("tog_fs") lo.geometry = geo 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 - 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.geometry = geo lo.style = osc_styles.smallButtonsBar |