switch sides

Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2023-01-17 13:28:33 +08:00
parent 45c0e10102
commit 333092f983
49 changed files with 373 additions and 61 deletions

View File

@@ -33,10 +33,12 @@ class RemotePage extends StatefulWidget {
Key? key,
required this.id,
required this.menubarState,
this.switchUuid,
}) : super(key: key);
final String id;
final MenubarState menubarState;
final String? switchUuid;
final SimpleWrapper<State<RemotePage>?> _lastState = SimpleWrapper(null);
FFI get ffi => (_lastState.value! as _RemotePageState)._ffi;
@@ -100,7 +102,10 @@ class _RemotePageState extends State<RemotePage>
showKBLayoutTypeChooserIfNeeded(
_ffi.ffiModel.pi.platform, _ffi.dialogManager);
});
_ffi.start(widget.id);
_ffi.start(
widget.id,
switchUuid: widget.switchUuid,
);
WidgetsBinding.instance.addPostFrameCallback((_) {
SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
_ffi.dialogManager

View File

@@ -64,6 +64,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
key: ValueKey(peerId),
id: peerId,
menubarState: _menubarState,
switchUuid: params['switch_uuid'],
),
));
_update_remote_count();
@@ -84,6 +85,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
if (call.method == "new_remote_desktop") {
final args = jsonDecode(call.arguments);
final id = args['id'];
final switchUuid = args['switch_uuid'];
window_on_top(windowId());
ConnectionTypeState.init(id);
tabController.add(TabInfo(
@@ -96,6 +98,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
key: ValueKey(id),
id: id,
menubarState: _menubarState,
switchUuid: switchUuid,
),
));
} else if (call.method == "onDestroy") {

View File

@@ -516,6 +516,15 @@ class _CmControlPanel extends StatelessWidget {
return Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Offstage(
offstage: !client.fromSwitch,
child: buildButton(context,
color: Colors.purple,
onClick: () => handleSwitchBack(context),
icon: Icon(Icons.reply, color: Colors.white),
text: "Switch Sides",
textColor: Colors.white),
),
Offstage(
offstage: !showElevation,
child: buildButton(context, color: Colors.green[700], onClick: () {
@@ -674,6 +683,10 @@ class _CmControlPanel extends StatelessWidget {
windowManager.close();
}
}
void handleSwitchBack(BuildContext context) {
bind.cmSwitchBack(connId: client.id);
}
}
void checkClickTime(int id, Function() callback) async {

View File

@@ -509,6 +509,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
List<MenuEntryBase<String>> _getControlMenu(BuildContext context) {
final pi = widget.ffi.ffiModel.pi;
final perms = widget.ffi.ffiModel.permissions;
final peer_version = widget.ffi.ffiModel.pi.version;
const EdgeInsets padding = EdgeInsets.only(left: 14.0, right: 5.0);
final List<MenuEntryBase<String>> displayMenu = [];
displayMenu.addAll([
@@ -651,6 +652,18 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
dismissOnClicked: true,
));
}
if (version_cmp(peer_version, '1.2.0') >= 0) {
displayMenu.add(MenuEntryButton<String>(
childBuilder: (TextStyle? style) => Text(
translate('Switch Sides'),
style: style,
),
proc: () =>
showConfirmSwitchSidesDialog(widget.id, widget.ffi.dialogManager),
padding: padding,
dismissOnClicked: true,
));
}
}
if (pi.version.isNotEmpty) {
@@ -721,6 +734,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
List<MenuEntryBase<String>> _getDisplayMenu(
dynamic futureData, int remoteCount) {
const EdgeInsets padding = EdgeInsets.only(left: 18.0, right: 8.0);
final peer_version = widget.ffi.ffiModel.pi.version;
final displayMenu = [
MenuEntryRadios<String>(
text: translate('Ratio'),
@@ -880,9 +894,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
final fpsSlider = Offstage(
offstage:
(await bind.mainIsUsingPublicServer() && direct != true) ||
(await bind.versionToNumber(
v: widget.ffi.ffiModel.pi.version) <
await bind.versionToNumber(v: '1.2.0')),
version_cmp(peer_version, '1.2.0') < 0,
child: Row(
children: [
Obx((() => Slider(
@@ -1391,16 +1403,33 @@ void showAuditDialog(String id, dialogManager) async {
focusNode: focusNode,
)),
actions: [
TextButton(
style: flatButtonStyle,
onPressed: close,
child: Text(translate('Cancel')),
),
TextButton(
style: flatButtonStyle,
onPressed: submit,
child: Text(translate('OK')),
),
dialogButton('Cancel', onPressed: close, isOutline: true),
dialogButton('OK', onPressed: submit)
],
onSubmit: submit,
onCancel: close,
);
});
}
void showConfirmSwitchSidesDialog(
String id, OverlayDialogManager dialogManager) async {
dialogManager.show((setState, close) {
submit() async {
await bind.sessionSwitchSides(id: id);
closeConnection(id: id);
}
return CustomAlertDialog(
title: Text(translate('Switch Sides')),
content: Column(
children: [
Text(translate('Please confirm if you want to share your desktop?')),
],
),
actions: [
dialogButton('Cancel', onPressed: close, isOutline: true),
dialogButton('OK', onPressed: submit),
],
onSubmit: submit,
onCancel: close,