Skip to content

R
rustdesk
Commit 63cb816b authored by csf's avatar csf
Browse files
Options

fix: close one connection tab will dispose all tabs (Obx)

parent b93e59df
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 63 deletions
flutter/lib/desktop/pages/connection_tab_page.dart
View file @ 63cb816b
......@@ -44,12 +44,11 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
tabController.jumpBy(peerId);
clientClose(ffi(peerId).dialogManager);
},
page: Obx(() => RemotePage(
key: ValueKey(peerId),
id: peerId,
tabBarHeight:
fullscreen.isTrue ? 0 : kDesktopRemoteTabBarHeight,
))));
page: RemotePage(
key: ValueKey(peerId),
id: peerId,
tabBarHeight: fullscreen.isTrue ? 0 : kDesktopRemoteTabBarHeight,
)));
}
}
......@@ -81,12 +80,11 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
tabController.jumpBy(id);
clientClose(ffi(id).dialogManager);
},
page: Obx(() => RemotePage(
key: ValueKey(id),
id: id,
tabBarHeight:
fullscreen.isTrue ? 0 : kDesktopRemoteTabBarHeight,
))));
page: RemotePage(
key: ValueKey(id),
id: id,
tabBarHeight: fullscreen.isTrue ? 0 : kDesktopRemoteTabBarHeight,
)));
} else if (call.method == "onDestroy") {
tabController.clear();
}
......@@ -104,57 +102,55 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
border: Border.all(color: MyTheme.color(context).border!)),
child: Scaffold(
backgroundColor: MyTheme.color(context).bg,
body: Obx(() => DesktopTab(
controller: tabController,
showTabBar: fullscreen.isFalse,
onWindowCloseButton: () {
tabController.clear();
},
tail: AddButton().paddingOnly(left: 10),
pageViewBuilder: (pageView) {
WindowController.fromWindowId(windowId())
.setFullscreen(fullscreen.isTrue);
return pageView;
},
tabBuilder: (key, icon, label, themeConf) => Obx(() {
final connectionType = ConnectionTypeState.find(key);
if (!connectionType.isValid()) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
icon,
label,
],
);
} else {
final msgDirect = translate(
connectionType.direct.value ==
ConnectionType.strDirect
? 'Direct Connection'
: 'Relay Connection');
final msgSecure = translate(
connectionType.secure.value ==
ConnectionType.strSecure
? 'Secure Connection'
: 'Insecure Connection');
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
icon,
Tooltip(
message: '$msgDirect\n$msgSecure',
child: Image.asset(
'assets/${connectionType.secure.value}${connectionType.direct.value}.png',
width: themeConf.iconSize,
height: themeConf.iconSize,
).paddingOnly(right: 5),
),
label,
],
);
}
}),
))),
body: DesktopTab(
controller: tabController,
showTabBar: fullscreen.isFalse,
onWindowCloseButton: () {
tabController.clear();
},
tail: AddButton().paddingOnly(left: 10),
pageViewBuilder: (pageView) {
WindowController.fromWindowId(windowId())
.setFullscreen(fullscreen.isTrue);
return pageView;
},
tabBuilder: (key, icon, label, themeConf) => Obx(() {
final connectionType = ConnectionTypeState.find(key);
if (!connectionType.isValid()) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
icon,
label,
],
);
} else {
final msgDirect = translate(connectionType.direct.value ==
ConnectionType.strDirect
? 'Direct Connection'
: 'Relay Connection');
final msgSecure = translate(connectionType.secure.value ==
ConnectionType.strSecure
? 'Secure Connection'
: 'Insecure Connection');
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
icon,
Tooltip(
message: '$msgDirect\n$msgSecure',
child: Image.asset(
'assets/${connectionType.secure.value}${connectionType.direct.value}.png',
width: themeConf.iconSize,
height: themeConf.iconSize,
).paddingOnly(right: 5),
),
label,
],
);
}
}),
)),
),
));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment