github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-18 21:16:10 +01:00
Code Releases Activity

osc: calculate osc_geo position after aspect correction

Browse Source 
Fixes #7098
This commit is contained in:
Jan Janssen 2019-10-29 13:34:15 +01:00 committed by wm4
parent afe3a5a010
commit b27836011e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
player/lua/osc.lua
View File

@ -1253,13 +1253,11 @@ layouts["slimbox"] = function ()
end
function bar_layout(direction)
local y_offset = (direction < 0) and osc_param.playresy or 0
local osc_geo = {
x = -2,
y = y_offset + direction * (54 + user_opts.barmargin),
y,
an = (direction < 0) and 7 or 1,
w = osc_param.playresx + 4,
w,
h = 56,
}
@ -1273,8 +1271,12 @@ function bar_layout(direction)
if ((osc_param.display_aspect > 0) and (osc_param.playresx < minW)) then
osc_param.playresy = minW / osc_param.display_aspect
osc_param.playresx = osc_param.playresy * osc_param.display_aspect
osc_geo.y = y_offset + direction * (54 + user_opts.barmargin)
osc_geo.w = osc_param.playresx + 4
end
osc_geo.y = direction * (54 + user_opts.barmargin)
osc_geo.w = osc_param.playresx + 4
if direction < 0 then
osc_geo.y = osc_geo.y + osc_param.playresy
end
local line1 = osc_geo.y - direction * (9 + padY)