RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 10:02:17 +00:00
Code Issues Releases Wiki Activity

osc: only add sub forced-only toggle to layout for DVD/PGS subs

Browse Source 
Fixes: 945d7c1eda

Previously, we would have a button with empty string added to the layout
for non DVD/PGS subtitles. This would cause there to be an invisible
button present that would take up space and could still be clicked
despite being invisible when the current subtitle track was not DVD/PGS.
The idea was that the button would be invisible for regular subtitle
tracks, and be visible as "[ ]"/"[F]" for DVD/PGS subtitle tracks.

This commit modifies the bar and box layouts to only add this button if
the current subtitle track is DVD/PGS. This results in there no longer
being an invisible button, and also prevents it from taking up space.
The button is added to layout as before when the current subtitle track
is DVD/PGS, matching the same logic as before.
This commit is contained in:
llyyr 2023-08-27 20:52:41 +05:30 committed by Dudemanguy
parent 8301906218
commit d0bc907806
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
player/lua/osc.lua
View File

@ -1315,10 +1315,13 @@ layouts["box"] = function ()
{x = posX - pos_offsetX, y = bigbtnrowY, an = 7, w = 70, h = 18}
lo.style = osc_styles.smallButtonsL
lo = add_layout("tog_forced_only")
lo.geometry =
sub_codec = mp.get_property("current-tracks/sub/codec")
if (sub_codec == "dvd_subtitle" or sub_codec == "hdmv_pgs_subtitle") then
lo = add_layout("tog_forced_only")
lo.geometry =
{x = posX - pos_offsetX + 70, y = bigbtnrowY - 1, an = 7, w = 25, h = 18}
lo.style = osc_styles.smallButtonsL
lo.style = osc_styles.smallButtonsL
end
lo = add_layout("tog_fs")
lo.geometry =
@ -1627,10 +1630,13 @@ function bar_layout(direction)
lo.style = osc_styles.smallButtonsBar
-- Forced-subs-only button
geo = { x = geo.x - geo.w - padX, y = geo.y, an = geo.an, w = geo.w, h = geo.h }
lo = add_layout("tog_forced_only")
lo.geometry = geo
lo.style = osc_styles.smallButtonsBar
sub_codec = mp.get_property("current-tracks/sub/codec")
if (sub_codec == "dvd_subtitle" or sub_codec == "hdmv_pgs_subtitle") then
geo = { x = geo.x - geo.w - padX, y = geo.y, an = geo.an, w = geo.w, h = geo.h }
lo = add_layout("tog_forced_only")
lo.geometry = geo
lo.style = osc_styles.smallButtonsBar
end
-- Track selection buttons
geo = { x = geo.x - tsW - padX, y = geo.y, an = geo.an, w = tsW, h = geo.h }
@ -1971,13 +1977,8 @@ function osc_init()
-- tog_forced_only
local tog_forced_only = new_element("tog_forced_only", "button")
ne = tog_forced_only
ne.content = function ()
sub_codec = mp.get_property("current-tracks/sub/codec")
if (sub_codec ~= "dvd_subtitle" and sub_codec ~= "hdmv_pgs_subtitle") then
return ""
end
local base_a = tog_forced_only.layout.alpha
local alpha = base_a[1]
if not mp.get_property_bool("sub-forced-only-cur") then