colin/uosc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: rectangle borders not inheriting opacity (#195)

Browse Source 
This caused problems with the opacity for speed notches.
This commit is contained in:
christoph-heinrich
2022-09-14 17:25:54 +02:00
committed by GitHub
parent 2f297c2834
commit e7710128fe
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/uosc.lua
View File

@@ -1030,7 +1030,7 @@ end
---@param ay number
---@param bx number
---@param by number
---@param opts? {color?: string; border?: number; border_color?: string; opacity?: number; border_opacity?: number; clip?: string, radius?: number}
---@param opts? {color?: string; border?: number; border_color?: string; opacity?: number; clip?: string, radius?: number}
function ass_mt:rect(ax, ay, bx, by, opts)
opts = opts or {}
local border_size = opts.border or 0
@@ -1044,11 +1044,7 @@ function ass_mt:rect(ax, ay, bx, by, opts)
end
-- opacity
if opts.opacity then
tags = tags .. string.format('\\1a&H%X&', opacity_to_alpha(opts.opacity))
end
-- border opacity
if opts.border_opacity then
tags = tags .. string.format('\\3a&H%X&', opacity_to_alpha(opts.border_opacity))
tags = tags .. string.format('\\alpha&H%X&', opacity_to_alpha(opts.opacity))
end
-- clip
if opts.clip then
@@ -2352,7 +2348,7 @@ function Speed:render()
ass:rect(notch_x - notch_thickness, notch_ay, notch_x + notch_thickness, notch_by, {
color = options.color_foreground, border = 1, border_color = options.color_background,
opacity = math.min(1.2 - (math.abs((notch_x - ax - half_width) / half_width)), 1) * opacity,
opacity = math.min(1.2 - (math.abs((notch_x - ax - half_width) / half_width)), 1) * opacity
})
end
end