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

fix: osd-* properties messing up the UI

Browse Source 
closes #241
This commit is contained in:
tomasklaen
2022-09-28 18:16:06 +02:00
parent a1fdceca71
commit f084a3ac4b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/uosc.lua
View File

@@ -1006,7 +1006,7 @@ end
function ass_mt:txt(x, y, align, value, opts) function ass_mt:txt(x, y, align, value, opts)
local border_size = opts.border or 0 local border_size = opts.border or 0
local shadow_size = opts.shadow or 0 local shadow_size = opts.shadow or 0
local tags = '\\pos(' .. x .. ',' .. y .. ')\\an' .. align .. '\\blur0' local tags = '\\pos(' .. x .. ',' .. y .. ')\\rDefault\\an' .. align .. '\\blur0'
-- font -- font
tags = tags .. '\\fn' .. (opts.font or config.font) tags = tags .. '\\fn' .. (opts.font or config.font)
-- font size -- font size
@@ -1063,7 +1063,7 @@ end
function ass_mt:rect(ax, ay, bx, by, opts) function ass_mt:rect(ax, ay, bx, by, opts)
opts = opts or {} opts = opts or {}
local border_size = opts.border or 0 local border_size = opts.border or 0
local tags = '\\pos(0,0)\\blur0' local tags = '\\pos(0,0)\\rDefault\\blur0'
-- border -- border
tags = tags .. '\\bord' .. border_size tags = tags .. '\\bord' .. border_size
-- colors -- colors
@@ -2416,7 +2416,7 @@ function Speed:render()
-- Center guide -- Center guide
ass:new_event() ass:new_event()
ass:append('{\\blur0\\bord1\\shad0\\1c&H' .. options.foreground .. '\\3c&H' .. options.background .. '}') ass:append('{\\rDefault\\blur0\\bord1\\shad0\\1c&H' .. options.foreground .. '\\3c&H' .. options.background .. '}')
ass:opacity(opacity) ass:opacity(opacity)
ass:pos(0, 0) ass:pos(0, 0)
ass:draw_start() ass:draw_start()
@@ -2839,7 +2839,7 @@ function Timeline:render()
-- Background -- Background
ass:new_event() ass:new_event()
ass:pos(0, 0) ass:pos(0, 0)
ass:append('{\\blur0\\bord0\\1c&H' .. options.background .. '}') ass:append('{\\rDefault\\blur0\\bord0\\1c&H' .. options.background .. '}')
ass:opacity(math.max(options.timeline_opacity - 0.1, 0)) ass:opacity(math.max(options.timeline_opacity - 0.1, 0))
ass:draw_start() ass:draw_start()
ass:rect_cw(bax, bay, fax, bby) --left of progress ass:rect_cw(bax, bay, fax, bby) --left of progress
@@ -2890,7 +2890,7 @@ function Timeline:render()
local chapter_y = fay - 1 local chapter_y = fay - 1
ass:new_event() ass:new_event()
ass:append(string.format( ass:append(string.format(
'{\\pos(0,0)\\blur0\\yshad0.01\\bord%f\\1c&H%s\\3c&H%s\\4c&H%s\\1a&H%X&\\3a&H00&\\4a&H00&}', '{\\pos(0,0)\\rDefault\\blur0\\yshad0.01\\bord%f\\1c&H%s\\3c&H%s\\4c&H%s\\1a&H%X&\\3a&H00&\\4a&H00&}',
diamond_border, options.foreground, options.background, options.background, diamond_border, options.foreground, options.background, options.background,
opacity_to_alpha(options.timeline_opacity * options.timeline_chapters_opacity) opacity_to_alpha(options.timeline_opacity * options.timeline_chapters_opacity)
)) ))
@@ -3642,7 +3642,7 @@ function VolumeSlider:render()
-- Background -- Background
ass:new_event() ass:new_event()
ass:append('{\\blur0\\bord0\\1c&H' .. options.background .. ass:append('{\\rDefault\\blur0\\bord0\\1c&H' .. options.background ..
'\\iclip(' .. fg_path.scale .. ', ' .. fg_path.text .. ')}') '\\iclip(' .. fg_path.scale .. ', ' .. fg_path.text .. ')}')
ass:opacity(math.max(options.volume_opacity - 0.1, 0), visibility) ass:opacity(math.max(options.volume_opacity - 0.1, 0), visibility)
ass:pos(0, 0) ass:pos(0, 0)
@@ -3652,7 +3652,7 @@ function VolumeSlider:render()
-- Foreground -- Foreground
ass:new_event() ass:new_event()
ass:append('{\\blur0\\bord0\\1c&H' .. options.foreground .. '}') ass:append('{\\rDefault\\blur0\\bord0\\1c&H' .. options.foreground .. '}')
ass:opacity(options.volume_opacity, visibility) ass:opacity(options.volume_opacity, visibility)
ass:pos(0, 0) ass:pos(0, 0)
ass:draw_start() ass:draw_start()