Merge pull request #3353 from 21pages/elevate

peercard and request elevation menu
This commit is contained in:
RustDesk
2023-02-24 17:46:37 +08:00
committed by GitHub
12 changed files with 127 additions and 57 deletions

View File

@@ -598,6 +598,7 @@ class _ControlMenu extends StatelessWidget {
hoverColor: _MenubarTheme.hoverBlueColor,
ffi: ffi,
menuChildren: [
requestElevation(),
osPassword(),
transferFile(context),
tcpTunneling(context),
@@ -611,6 +612,15 @@ class _ControlMenu extends StatelessWidget {
]);
}
requestElevation() {
final visible = ffi.elevationModel.showRequestMenu;
if (!visible) return Offstage();
return _MenuItemButton(
child: Text(translate('Request Elevation')),
ffi: ffi,
onPressed: () => showRequestElevationDialog(id, ffi.dialogManager));
}
osPassword() {
return _MenuItemButton(
child: Text(translate('OS Password')),
@@ -1091,7 +1101,8 @@ class _DisplayMenuState extends State<_DisplayMenu> {
await bind.sessionSetImageQuality(id: widget.id, value: value);
}
return SubmenuButton(
return _SubmenuButton(
ffi: widget.ffi,
child: Text(translate('Image Quality')),
menuChildren: [
_RadioMenuButton<String>(
@@ -1125,7 +1136,7 @@ class _DisplayMenuState extends State<_DisplayMenu> {
},
ffi: widget.ffi,
),
].map((e) => _buildPointerTrackWidget(e, widget.ffi)).toList(),
],
);
});
}
@@ -1300,7 +1311,8 @@ class _DisplayMenuState extends State<_DisplayMenu> {
bind.sessionChangePreferCodec(id: widget.id);
}
return SubmenuButton(
return _SubmenuButton(
ffi: widget.ffi,
child: Text(translate('Codec')),
menuChildren: [
_RadioMenuButton<String>(
@@ -1331,7 +1343,7 @@ class _DisplayMenuState extends State<_DisplayMenu> {
onChanged: onChanged,
ffi: widget.ffi,
),
].map((e) => _buildPointerTrackWidget(e, widget.ffi)).toList());
]);
});
}
@@ -1363,7 +1375,8 @@ class _DisplayMenuState extends State<_DisplayMenu> {
}
}
return SubmenuButton(
return _SubmenuButton(
ffi: widget.ffi,
menuChildren: resolutions
.map((e) => _RadioMenuButton(
value: '${e.width}x${e.height}',
@@ -1371,8 +1384,6 @@ class _DisplayMenuState extends State<_DisplayMenu> {
onChanged: onChanged,
ffi: widget.ffi,
child: Text('${e.width}x${e.height}')))
.toList()
.map((e) => _buildPointerTrackWidget(e, widget.ffi))
.toList(),
child: Text(translate("Resolution")));
}
@@ -1859,6 +1870,28 @@ class _IconSubmenuButtonState extends State<_IconSubmenuButton> {
}
}
class _SubmenuButton extends StatelessWidget {
final List<Widget> menuChildren;
final Widget? child;
final FFI ffi;
const _SubmenuButton({
Key? key,
required this.menuChildren,
required this.child,
required this.ffi,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return SubmenuButton(
key: key,
child: child,
menuChildren:
menuChildren.map((e) => _buildPointerTrackWidget(e, ffi)).toList(),
);
}
}
class _MenuItemButton extends StatelessWidget {
final VoidCallback? onPressed;
final Widget? trailingIcon;