TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-31 09:01:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename menubar as toolbar in code and view

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2023-06-11 16:32:22 +08:00
parent 844e7420de
commit 5729cbf77d
40 changed files with 245 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
flutter/lib/desktop/pages/remote_page.dart
View File

@@ -33,7 +33,7 @@ class RemotePage extends StatefulWidget {
Key? key,
required this.id,
required this.password,
required this.menubarState,
required this.toolbarState,
required this.tabController,
this.switchUuid,
this.forceRelay,
@@ -41,7 +41,7 @@ class RemotePage extends StatefulWidget {
final String id;
final String? password;
final MenubarState menubarState;
final ToolbarState toolbarState;
final String? switchUuid;
final bool? forceRelay;
final SimpleWrapper<State<RemotePage>?> _lastState = SimpleWrapper(null);
@@ -75,7 +75,7 @@ class _RemotePageState extends State<RemotePage>
final FocusNode _rawKeyFocusNode = FocusNode(debugLabel: "rawkeyFocusNode");
Function(bool)? _onEnterOrLeaveImage4Menubar;
Function(bool)? _onEnterOrLeaveImage4Toolbar;
late FFI _ffi;
@@ -265,14 +265,14 @@ class _RemotePageState extends State<RemotePage>
child: getBodyForDesktop(context))),
upperLayer: [
OverlayEntry(
builder: (context) => RemoteMenubar(
builder: (context) => RemoteToolbar(
id: widget.id,
ffi: _ffi,
state: widget.menubarState,
state: widget.toolbarState,
onEnterOrLeaveImageSetter: (func) =>
_onEnterOrLeaveImage4Menubar = func,
_onEnterOrLeaveImage4Toolbar = func,
onEnterOrLeaveImageCleaner: () =>
_onEnterOrLeaveImage4Menubar = null,
_onEnterOrLeaveImage4Toolbar = null,
))
],
),
@@ -299,9 +299,9 @@ class _RemotePageState extends State<RemotePage>
void enterView(PointerEnterEvent evt) {
_cursorOverImage.value = true;
_firstEnterImage.value = true;
if (_onEnterOrLeaveImage4Menubar != null) {
if (_onEnterOrLeaveImage4Toolbar != null) {
try {
_onEnterOrLeaveImage4Menubar!(true);
_onEnterOrLeaveImage4Toolbar!(true);
} catch (e) {
//
}
@@ -322,9 +322,9 @@ class _RemotePageState extends State<RemotePage>
_cursorOverImage.value = false;
_firstEnterImage.value = false;
if (_onEnterOrLeaveImage4Menubar != null) {
if (_onEnterOrLeaveImage4Toolbar != null) {
try {
_onEnterOrLeaveImage4Menubar!(false);
_onEnterOrLeaveImage4Toolbar!(false);
} catch (e) {
//
}

18
flutter/lib/desktop/pages/remote_tab_page.dart
View File

@@ -45,12 +45,12 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
static const IconData selectedIcon = Icons.desktop_windows_sharp;
static const IconData unselectedIcon = Icons.desktop_windows_outlined;
late MenubarState _menubarState;
late ToolbarState _toolbarState;
var connectionMap = RxList<Widget>.empty(growable: true);
_ConnectionTabPageState(Map<String, dynamic> params) {
_menubarState = MenubarState();
_toolbarState = ToolbarState();
RemoteCountState.init();
final peerId = params['id'];
if (peerId != null) {
@@ -76,7 +76,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
key: ValueKey(peerId),
id: peerId,
password: params['password'],
menubarState: _menubarState,
toolbarState: _toolbarState,
tabController: tabController,
switchUuid: params['switch_uuid'],
forceRelay: params['forceRelay'],
@@ -103,7 +103,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
final switchUuid = args['switch_uuid'];
window_on_top(windowId());
ConnectionTypeState.init(id);
_menubarState.setShow(
_toolbarState.setShow(
bind.mainGetUserDefaultOption(key: 'collapse_toolbar') != 'Y');
tabController.add(TabInfo(
key: id,
@@ -115,7 +115,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
key: ValueKey(id),
id: id,
password: args['password'],
menubarState: _menubarState,
toolbarState: _toolbarState,
tabController: tabController,
switchUuid: switchUuid,
forceRelay: args['forceRelay'],
@@ -138,7 +138,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
@override
void dispose() {
super.dispose();
_menubarState.save();
_toolbarState.save();
}
@override
@@ -243,7 +243,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
));
}
// Note: Some dup code to ../widgets/remote_menubar
// Note: Some dup code to ../widgets/remote_toolbar
Widget _tabMenuBuilder(String key, CancelFunc cancelFunc) {
final List<MenuEntryBase<String>> menu = [];
const EdgeInsets padding = EdgeInsets.only(left: 8.0, right: 5.0);
@@ -269,11 +269,11 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
MenuEntryButton<String>(
childBuilder: (TextStyle? style) => Obx(() => Text(
translate(
_menubarState.show.isTrue ? 'Hide Menubar' : 'Show Menubar'),
_toolbarState.show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'),
style: style,
)),
proc: () {
_menubarState.switchShow();
_toolbarState.switchShow();
cancelFunc();
},
padding: padding,