support switching tabs on home page

getlantern · Nov 26, 2023 · 2d6f382 · 2d6f382
1 parent 168f8d3
commit 2d6f382
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/desktop/lib.go b/desktop/lib.go
@@ -89,11 +89,14 @@ func sendError(err error) *C.char {
 
 //export SelectedTab
 func SelectedTab() *C.char {
+	selectedTabMu.Lock()
+	defer selectedTabMu.Unlock()
 	return C.CString(selectedTab)
 }
 
 //export SetSelectTab
-func SetSelectTab(tab string) {
+func SetSelectTab(ttab *C.char) {
+	tab := C.GoString(ttab)
 	selectedTabMu.Lock()
 	defer selectedTabMu.Unlock()
 	selectedTab = tab

diff --git a/lib/desktop/custom_bottom_item.dart b/lib/desktop/custom_bottom_item.dart
@@ -59,6 +59,7 @@ class CustomBottomBarItem extends StatelessWidget {
               onTap: (() {
                 final tab = name.toNativeUtf8();
                 setSelectTab(tab);
+                context.pushRoute(DesktopHome());
               }),
               child: Container(
                 decoration: ShapeDecoration(

diff --git a/lib/desktop/home.dart b/lib/desktop/home.dart
@@ -30,7 +30,7 @@ class _DesktopHomePageState extends State<DesktopHomePage> {
       return Scaffold(
         body: buildBody(true),
         bottomNavigationBar: CustomBottomBar(
-          selectedTab: TAB_VPN,
+          selectedTab: selectedTab().toDartString(),
           isDevelop: true,
           isTesting: true,
         ),