diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index 0fb1d83a0..74ebe9189 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -265,7 +265,7 @@ class _LiveRoomPageState extends State liveRoomController: _liveRoomController, plPlayerController: plPlayerController, isFullScreen: isFullScreen, - isPipMode: isPipMode, + isPipMode: plPlayerController.isDesktopPip || isPipMode, ), ); } diff --git a/lib/pages/video/widgets/header_mixin.dart b/lib/pages/video/widgets/header_mixin.dart index c5c0c1e24..2a3cbbb50 100644 --- a/lib/pages/video/widgets/header_mixin.dart +++ b/lib/pages/video/widgets/header_mixin.dart @@ -45,9 +45,7 @@ mixin HeaderMixin on State { icon: const Icon(Icons.refresh), onPressed: () { onPressed(); - if (isDanmaku) { - // plPlayerController.putDanmakuSettings(); - } else { + if (!isDanmaku) { plPlayerController.putSubtitleSettings(); } }, @@ -134,6 +132,7 @@ mixin HeaderMixin on State { void updateFontWeight(double val) { DanmakuOptions.danmakuFontWeight = val.toInt(); + setState(() {}); setOptions(); } @@ -275,11 +274,7 @@ mixin HeaderMixin on State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text('显示区域 ${DanmakuOptions.danmakuShowArea * 100}%'), - resetBtn( - theme, - '50.0%', - () => updateShowArea(0.5), - ), + resetBtn(theme, '50.0%', () => updateShowArea(0.5)), ], ), Padding( @@ -305,11 +300,7 @@ mixin HeaderMixin on State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text('不透明度 ${plPlayerController.danmakuOpacity * 100}%'), - resetBtn( - theme, - '100.0%', - () => updateOpacity(1.0), - ), + resetBtn(theme, '100.0%', () => updateOpacity(1.0)), ], ), Padding( @@ -337,11 +328,7 @@ mixin HeaderMixin on State { Text( '字体粗细 ${DanmakuOptions.danmakuFontWeight + 1}(可能无法精确调节)', ), - resetBtn( - theme, - 6, - () => updateFontWeight(5), - ), + resetBtn(theme, 6, () => updateFontWeight(5)), ], ), Padding( @@ -367,11 +354,7 @@ mixin HeaderMixin on State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text('描边粗细 ${DanmakuOptions.danmakuStrokeWidth}'), - resetBtn( - theme, - 1.5, - () => updateStrokeWidth(1.5), - ), + resetBtn(theme, 1.5, () => updateStrokeWidth(1.5)), ], ), Padding( @@ -400,11 +383,7 @@ mixin HeaderMixin on State { Text( '字体大小 ${(DanmakuOptions.danmakuFontScale * 100).toStringAsFixed(1)}%', ), - resetBtn( - theme, - '100.0%', - () => updateFontSize(1.0), - ), + resetBtn(theme, '100.0%', () => updateFontSize(1.0)), ], ), Padding( @@ -433,11 +412,7 @@ mixin HeaderMixin on State { Text( '全屏字体大小 ${(DanmakuOptions.danmakuFontScaleFS * 100).toStringAsFixed(1)}%', ), - resetBtn( - theme, - '120.0%', - () => updateFontSizeFS(1.2), - ), + resetBtn(theme, '120.0%', () => updateFontSizeFS(1.2)), ], ), Padding( @@ -464,11 +439,7 @@ mixin HeaderMixin on State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text('滚动弹幕时长 ${DanmakuOptions.danmakuDuration} 秒'), - resetBtn( - theme, - 7.0, - () => updateDuration(7.0), - ), + resetBtn(theme, 7.0, () => updateDuration(7.0)), ], ), Padding( @@ -494,11 +465,7 @@ mixin HeaderMixin on State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text('静态弹幕时长 ${DanmakuOptions.danmakuStaticDuration} 秒'), - resetBtn( - theme, - 4.0, - () => updateStaticDuration(4.0), - ), + resetBtn(theme, 4.0, () => updateStaticDuration(4.0)), ], ), Padding( @@ -524,11 +491,7 @@ mixin HeaderMixin on State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text('弹幕行高 ${DanmakuOptions.danmakuLineHeight}'), - resetBtn( - theme, - 1.6, - () => updateLineHeight(1.6), - ), + resetBtn(theme, 1.6, () => updateLineHeight(1.6)), ], ), Padding( diff --git a/pubspec.lock b/pubspec.lock index edc06c276..f68159d10 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -239,7 +239,7 @@ packages: description: path: "." ref: main - resolved-ref: "1199a960662bf0549a60c0da51909628db041654" + resolved-ref: "2012a4b9758bf29b30884bbf27247602925a7945" url: "https://github.com/bggRGjQaUbCoE/canvas_danmaku.git" source: git version: "0.2.6"