hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: popup menu, nav, pop (#8089)

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2024-05-18 23:55:05 +08:00 committed by GitHub
parent d3eaa6600d
commit 72d59af7b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/lib/common/widgets/peer_tab_page.dart
View File

@ -341,7 +341,8 @@ class _PeerTabPageState extends State<PeerTabPage>
currentValue: model.isVisibleEnabled[tabIndex], currentValue: model.isVisibleEnabled[tabIndex],
setter: (show) async { setter: (show) async {
model.setTabVisible(tabIndex, show); model.setTabVisible(tabIndex, show);
cancelFunc(); // Do not hide the current menu (checkbox)
// cancelFunc();
}, },
enabled: (!isOptVisiableFixed).obs)); enabled: (!isOptVisiableFixed).obs));
} }
@ -821,6 +822,9 @@ class _PeerViewDropdownState extends State<PeerViewDropdown> {
k: kOptionPeerCardUiType, k: kOptionPeerCardUiType,
v: peerCardUiType.value.index.toString(), v: peerCardUiType.value.index.toString(),
); );
if (Navigator.canPop(context)) {
Navigator.pop(context);
}
} }
}), }),
), ),

30
flutter/lib/desktop/widgets/popup_menu.dart
View File

@ -450,6 +450,13 @@ abstract class MenuEntrySwitchBase<T> extends MenuEntryBase<T> {
RxBool get curOption; RxBool get curOption;
Future<void> setOption(bool? option); Future<void> setOption(bool? option);
tryPop(BuildContext context) {
if (dismissOnClicked && Navigator.canPop(context)) {
Navigator.pop(context);
super.dismissCallback?.call();
}
}
@override @override
List<mod_menu.PopupMenuEntry<T>> build( List<mod_menu.PopupMenuEntry<T>> build(
BuildContext context, MenuConfig conf) { BuildContext context, MenuConfig conf) {
@ -485,13 +492,7 @@ abstract class MenuEntrySwitchBase<T> extends MenuEntryBase<T> {
value: curOption.value, value: curOption.value,
onChanged: isEnabled onChanged: isEnabled
? (v) { ? (v) {
if (super.dismissOnClicked && tryPop(context);
Navigator.canPop(context)) {
Navigator.pop(context);
if (super.dismissCallback != null) {
super.dismissCallback!();
}
}
setOption(v); setOption(v);
} }
: null, : null,
@ -501,13 +502,7 @@ abstract class MenuEntrySwitchBase<T> extends MenuEntryBase<T> {
value: curOption.value, value: curOption.value,
onChanged: isEnabled onChanged: isEnabled
? (v) { ? (v) {
if (super.dismissOnClicked && tryPop(context);
Navigator.canPop(context)) {
Navigator.pop(context);
if (super.dismissCallback != null) {
super.dismissCallback!();
}
}
setOption(v); setOption(v);
} }
: null, : null,
@ -518,12 +513,7 @@ abstract class MenuEntrySwitchBase<T> extends MenuEntryBase<T> {
])), ])),
onPressed: isEnabled onPressed: isEnabled
? () { ? () {
if (super.dismissOnClicked && Navigator.canPop(context)) { tryPop(context);
Navigator.pop(context);
if (super.dismissCallback != null) {
super.dismissCallback!();
}
}
setOption(!curOption.value); setOption(!curOption.value);
} }
: null, : null,