From 66b145912684f86ab08f6f2e4a5095357c2d9ecf Mon Sep 17 00:00:00 2001 From: csf Date: Wed, 24 Aug 2022 20:17:51 +0800 Subject: [PATCH] rename tabbar -> tab --- flutter/lib/desktop/pages/desktop_tab_page.dart | 8 ++++---- flutter/lib/desktop/widgets/tabbar_widget.dart | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flutter/lib/desktop/pages/desktop_tab_page.dart b/flutter/lib/desktop/pages/desktop_tab_page.dart index 5cc86f0ca..2504c699f 100644 --- a/flutter/lib/desktop/pages/desktop_tab_page.dart +++ b/flutter/lib/desktop/pages/desktop_tab_page.dart @@ -14,12 +14,12 @@ class DesktopTabPage extends StatefulWidget { } class _DesktopTabPageState extends State { - final tabBarController = DesktopTabBarController(); + final tabController = DesktopTabController(); @override void initState() { super.initState(); - tabBarController.state.value.tabs.add(TabInfo( + tabController.state.value.tabs.add(TabInfo( key: kTabLabelHomePage, label: kTabLabelHomePage, selectedIcon: Icons.home_sharp, @@ -38,7 +38,7 @@ class _DesktopTabPageState extends State { child: Scaffold( backgroundColor: MyTheme.color(context).bg, body: DesktopTab( - controller: tabBarController, + controller: tabController, theme: dark ? TarBarTheme.dark() : TarBarTheme.light(), isMainWindow: true, tail: ActionIcon( @@ -54,7 +54,7 @@ class _DesktopTabPageState extends State { } void onAddSetting() { - tabBarController.add(TabInfo( + tabController.add(TabInfo( key: kTabLabelSettingPage, label: kTabLabelSettingPage, selectedIcon: Icons.build_sharp, diff --git a/flutter/lib/desktop/widgets/tabbar_widget.dart b/flutter/lib/desktop/widgets/tabbar_widget.dart index 7544c6ef0..77757dd04 100644 --- a/flutter/lib/desktop/widgets/tabbar_widget.dart +++ b/flutter/lib/desktop/widgets/tabbar_widget.dart @@ -32,14 +32,14 @@ class TabInfo { required this.page}); } -class DesktopTabBarState { +class DesktopTabState { final List tabs = []; final ScrollPosController scrollController = ScrollPosController(itemCount: 0); final PageController pageController = PageController(); int selected = 0; - DesktopTabBarState() { + DesktopTabState() { scrollController.itemCount = tabs.length; // TODO test // WidgetsBinding.instance.addPostFrameCallback((_) { @@ -49,8 +49,8 @@ class DesktopTabBarState { } } -class DesktopTabBarController { - final state = DesktopTabBarState().obs; +class DesktopTabController { + final state = DesktopTabState().obs; void add(TabInfo tab) { if (!isDesktop) return; @@ -112,7 +112,7 @@ class DesktopTab extends StatelessWidget { final Widget Function(Widget pageView)? pageViewBuilder; final Widget? tail; - final DesktopTabBarController controller; + final DesktopTabController controller; late final state = controller.state; DesktopTab( @@ -323,8 +323,8 @@ class WindowActionPanel extends StatelessWidget { // ignore: must_be_immutable class _ListView extends StatelessWidget { - final DesktopTabBarController controller; - late final Rx state; + final DesktopTabController controller; + late final Rx state; final Function(String key)? onTabClose; final TarBarTheme theme;