Merge branch 'master' into service

This commit is contained in:
rustdesk
2022-04-15 17:51:35 +08:00
10 changed files with 388 additions and 137 deletions

View File

@@ -19,7 +19,7 @@ class ConnectionPage extends StatefulWidget implements PageShape {
final title = translate("Connection");
@override
final appBarActions = !isAndroid ? <Widget>[WebMenu()] : <Widget>[];
final appBarActions = isWeb ? <Widget>[WebMenu()] : <Widget>[];
@override
final scrollController = ScrollController();
@@ -312,7 +312,7 @@ class _WebMenuState extends State<WebMenu> {
},
onSelected: (value) {
if (value == 'server') {
showServer();
showServerSettings();
}
if (value == 'about') {
showAbout();