mirror of
https://github.com/mpv-player/mpv
synced 2024-12-24 15:52:25 +00:00
osd/libass: use BorderStyle=4 for background
Avoids (some) overlaps. Hopefully fixes #822.
This commit is contained in:
parent
f2a00f3de3
commit
c56520f232
11
sub/ass_mp.c
11
sub/ass_mp.c
@ -57,6 +57,16 @@ void mp_ass_set_style(ASS_Style *style, double res_y,
|
|||||||
style->FontSize = opts->font_size * scale;
|
style->FontSize = opts->font_size * scale;
|
||||||
style->PrimaryColour = MP_ASS_COLOR(opts->color);
|
style->PrimaryColour = MP_ASS_COLOR(opts->color);
|
||||||
style->SecondaryColour = style->PrimaryColour;
|
style->SecondaryColour = style->PrimaryColour;
|
||||||
|
#if LIBASS_VERSION >= 0x01102001
|
||||||
|
style->OutlineColour = MP_ASS_COLOR(opts->border_color);
|
||||||
|
if (opts->back_color.a) {
|
||||||
|
style->BackColour = MP_ASS_COLOR(opts->back_color);
|
||||||
|
style->BorderStyle = 4; // opaque box
|
||||||
|
} else {
|
||||||
|
style->BackColour = MP_ASS_COLOR(opts->shadow_color);
|
||||||
|
style->BorderStyle = 1; // outline
|
||||||
|
}
|
||||||
|
#else
|
||||||
if (opts->back_color.a) {
|
if (opts->back_color.a) {
|
||||||
style->OutlineColour = MP_ASS_COLOR(opts->back_color);
|
style->OutlineColour = MP_ASS_COLOR(opts->back_color);
|
||||||
style->BorderStyle = 3; // opaque box
|
style->BorderStyle = 3; // opaque box
|
||||||
@ -65,6 +75,7 @@ void mp_ass_set_style(ASS_Style *style, double res_y,
|
|||||||
style->BorderStyle = 1; // outline
|
style->BorderStyle = 1; // outline
|
||||||
}
|
}
|
||||||
style->BackColour = MP_ASS_COLOR(opts->shadow_color);
|
style->BackColour = MP_ASS_COLOR(opts->shadow_color);
|
||||||
|
#endif
|
||||||
style->Outline = opts->border_size * scale;
|
style->Outline = opts->border_size * scale;
|
||||||
style->Shadow = opts->shadow_offset * scale;
|
style->Shadow = opts->shadow_offset * scale;
|
||||||
style->Spacing = opts->spacing * scale;
|
style->Spacing = opts->spacing * scale;
|
||||||
|
Loading…
Reference in New Issue
Block a user