lee/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-12-13 19:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
NicKoehler
2023-03-15 18:12:59 +01:00
parent 02fc7df435 3af77af983
commit 948d2db073
48 changed files with 333 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/lib/desktop/widgets/remote_menubar.dart
View File

@@ -372,6 +372,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
offstage: _dragging.isTrue,
child: Material(
elevation: _MenubarTheme.elevation,
shadowColor: MyTheme.color(context).shadow,
child: _DraggableShowHide(
dragging: _dragging,
fractionX: _fractionX,
@@ -421,6 +422,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
children: [
Material(
elevation: _MenubarTheme.elevation,
shadowColor: MyTheme.color(context).shadow,
borderRadius: BorderRadius.all(Radius.circular(4.0)),
color: Theme.of(context)
.menuBarTheme