kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-09-14 08:25:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: window size remains same after exiting mini player (#618)

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2023-08-26 11:02:44 +06:00
parent 2a80761001
commit fb360035ad
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/collections/routes.dart
View File

@ -128,8 +128,8 @@ final router = GoRouter(
GoRoute( GoRoute(
path: "/mini-player", path: "/mini-player",
parentNavigatorKey: rootNavigatorKey, parentNavigatorKey: rootNavigatorKey,
pageBuilder: (context, state) => const SpotubePage( pageBuilder: (context, state) => SpotubePage(
child: MiniLyricsPage(), child: MiniLyricsPage(prevSize: state.extra as Size),
), ),
), ),
GoRoute( GoRoute(

7
lib/components/root/bottom_player.dart
View File

@ -92,6 +92,8 @@ class BottomPlayer extends HookConsumerWidget {
tooltip: context.l10n.mini_player, tooltip: context.l10n.mini_player,
icon: const Icon(SpotubeIcons.miniPlayer), icon: const Icon(SpotubeIcons.miniPlayer),
onPressed: () async { onPressed: () async {
final prevSize =
await DesktopTools.window.getSize();
await DesktopTools.window.setMinimumSize( await DesktopTools.window.setMinimumSize(
const Size(300, 300), const Size(300, 300),
); );
@ -106,7 +108,10 @@ class BottomPlayer extends HookConsumerWidget {
await Future.delayed( await Future.delayed(
const Duration(milliseconds: 100), const Duration(milliseconds: 100),
() async { () async {
GoRouter.of(context).go('/mini-player'); GoRouter.of(context).go(
'/mini-player',
extra: prevSize,
);
}, },
); );
}, },

7
lib/pages/lyrics/mini_lyrics.dart
View File

@ -19,13 +19,13 @@ import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
import 'package:spotube/utils/platform.dart'; import 'package:spotube/utils/platform.dart';
class MiniLyricsPage extends HookConsumerWidget { class MiniLyricsPage extends HookConsumerWidget {
const MiniLyricsPage({Key? key}) : super(key: key); final Size prevSize;
const MiniLyricsPage({Key? key, required this.prevSize}) : super(key: key);
@override @override
Widget build(BuildContext context, ref) { Widget build(BuildContext context, ref) {
final theme = Theme.of(context); final theme = Theme.of(context);
final update = useForceUpdate(); final update = useForceUpdate();
final prevSize = useRef<Size?>(null);
final wasMaximized = useRef<bool>(false); final wasMaximized = useRef<bool>(false);
final playlistQueue = ref.watch(ProxyPlaylistNotifier.provider); final playlistQueue = ref.watch(ProxyPlaylistNotifier.provider);
@ -35,7 +35,6 @@ class MiniLyricsPage extends HookConsumerWidget {
useEffect(() { useEffect(() {
WidgetsBinding.instance.addPostFrameCallback((_) async { WidgetsBinding.instance.addPostFrameCallback((_) async {
prevSize.value = await DesktopTools.window.getSize();
wasMaximized.value = await DesktopTools.window.isMaximized(); wasMaximized.value = await DesktopTools.window.isMaximized();
}); });
return null; return null;
@ -213,7 +212,7 @@ class MiniLyricsPage extends HookConsumerWidget {
if (wasMaximized.value) { if (wasMaximized.value) {
await DesktopTools.window.maximize(); await DesktopTools.window.maximize();
} else { } else {
await DesktopTools.window.setSize(prevSize.value!); await DesktopTools.window.setSize(prevSize);
} }
await DesktopTools.window await DesktopTools.window
.setAlignment(Alignment.center); .setAlignment(Alignment.center);