Revert "feat: custom subtitle bg stroke"

This reverts commit 168bb22670.
This commit is contained in:
bggRGjQaUbCoE
2025-01-05 12:14:34 +08:00
parent 22abc4488b
commit 2aa109b089
3 changed files with 1 additions and 51 deletions

View File

@@ -1025,7 +1025,6 @@ class _HeaderControlState extends State<HeaderControl> {
int subtitlePaddingH = widget.controller.subtitlePaddingH; int subtitlePaddingH = widget.controller.subtitlePaddingH;
int subtitlePaddingB = widget.controller.subtitlePaddingB; int subtitlePaddingB = widget.controller.subtitlePaddingB;
double subtitleBgOpaticy = widget.controller.subtitleBgOpaticy; double subtitleBgOpaticy = widget.controller.subtitleBgOpaticy;
double subtitleBgStroke = widget.controller.subtitleBgStroke;
final DanmakuController? danmakuController = final DanmakuController? danmakuController =
widget.controller.danmakuController; widget.controller.danmakuController;
@@ -1650,40 +1649,6 @@ class _HeaderControlState extends State<HeaderControl> {
), ),
), ),
), ),
Text('字幕背景边框粗细(背景不透明度为0时启用) $subtitleBgStroke'),
Padding(
padding: const EdgeInsets.only(
top: 0,
bottom: 6,
left: 10,
right: 10,
),
child: SliderTheme(
data: SliderThemeData(
trackShape: MSliderTrackShape(),
thumbColor: Theme.of(context).colorScheme.primary,
activeTrackColor: Theme.of(context).colorScheme.primary,
trackHeight: 10,
thumbShape: const RoundSliderThumbShape(
enabledThumbRadius: 6.0),
),
child: Slider(
min: 0,
max: 3,
divisions: 6,
value: subtitleBgStroke,
label: '$subtitleBgStroke',
onChanged: (double val) {
subtitleBgStroke = val;
widget.controller
..subtitleBgStroke = subtitleBgStroke
..updateSubtitleStyle()
..putDanmakuSettings();
setState(() {});
},
),
),
),
], ],
), ),
), ),

View File

@@ -260,18 +260,12 @@ class PlPlayerController {
late int subtitlePaddingH = GStorage.subtitlePaddingH; late int subtitlePaddingH = GStorage.subtitlePaddingH;
late int subtitlePaddingB = GStorage.subtitlePaddingB; late int subtitlePaddingB = GStorage.subtitlePaddingB;
late double subtitleBgOpaticy = GStorage.subtitleBgOpaticy; late double subtitleBgOpaticy = GStorage.subtitleBgOpaticy;
late double subtitleBgStroke = GStorage.subtitleBgStroke;
// 播放顺序相关 // 播放顺序相关
PlayRepeat playRepeat = PlayRepeat.pause; PlayRepeat playRepeat = PlayRepeat.pause;
final GlobalKey<VideoState> key = GlobalKey<VideoState>(); final GlobalKey<VideoState> key = GlobalKey<VideoState>();
Paint get subtitleBg => Paint()
..style = PaintingStyle.stroke
..strokeWidth = subtitleBgStroke
..color = Colors.black;
TextStyle get subTitleStyle => TextStyle( TextStyle get subTitleStyle => TextStyle(
height: 1.5, height: 1.5,
fontSize: fontSize:
@@ -280,11 +274,7 @@ class PlPlayerController {
wordSpacing: 0.1, wordSpacing: 0.1,
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
background: backgroundColor: Colors.black.withOpacity(subtitleBgOpaticy),
subtitleBgOpaticy == 0 && subtitleBgStroke != 0 ? subtitleBg : null,
backgroundColor: subtitleBgOpaticy == 0
? null
: Colors.black.withOpacity(subtitleBgOpaticy),
); );
SubtitleViewConfiguration get subtitleViewConfiguration => SubtitleViewConfiguration get subtitleViewConfiguration =>
@@ -1350,7 +1340,6 @@ class PlPlayerController {
setting.put(SettingBoxKey.subtitlePaddingH, subtitlePaddingH); setting.put(SettingBoxKey.subtitlePaddingH, subtitlePaddingH);
setting.put(SettingBoxKey.subtitlePaddingB, subtitlePaddingB); setting.put(SettingBoxKey.subtitlePaddingB, subtitlePaddingB);
setting.put(SettingBoxKey.subtitleBgOpaticy, subtitleBgOpaticy); setting.put(SettingBoxKey.subtitleBgOpaticy, subtitleBgOpaticy);
setting.put(SettingBoxKey.subtitleBgStroke, subtitleBgStroke);
} }
Future<void> dispose({String type = 'single'}) async { Future<void> dispose({String type = 'single'}) async {

View File

@@ -281,9 +281,6 @@ class GStorage {
static double get subtitleBgOpaticy => static double get subtitleBgOpaticy =>
setting.get(SettingBoxKey.subtitleBgOpaticy, defaultValue: 0.67); setting.get(SettingBoxKey.subtitleBgOpaticy, defaultValue: 0.67);
static double get subtitleBgStroke =>
setting.get(SettingBoxKey.subtitleBgStroke, defaultValue: 0.0);
static bool get badCertificateCallback => static bool get badCertificateCallback =>
setting.get(SettingBoxKey.badCertificateCallback, defaultValue: false); setting.get(SettingBoxKey.badCertificateCallback, defaultValue: false);
@@ -496,7 +493,6 @@ class SettingBoxKey {
subtitlePaddingH = 'subtitlePaddingH', subtitlePaddingH = 'subtitlePaddingH',
subtitlePaddingB = 'subtitlePaddingB', subtitlePaddingB = 'subtitlePaddingB',
subtitleBgOpaticy = 'subtitleBgOpaticy', subtitleBgOpaticy = 'subtitleBgOpaticy',
subtitleBgStroke = 'subtitleBgStroke',
badCertificateCallback = 'badCertificateCallback', badCertificateCallback = 'badCertificateCallback',
continuePlayingPart = 'continuePlayingPart', continuePlayingPart = 'continuePlayingPart',