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

have to put easyloading on FlutterEasyLoading, if on scaffold, mouse not

Browse Source 
work
This commit is contained in:
open-trade 2020-11-29 14:19:01 +08:00
parent ac4b14292d
commit 71493c8e7e
3 changed files with 104 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
flutter_hbb/lib/remote_page.dart
View File

@ -165,82 +165,81 @@ class _RemotePageState extends State<RemotePage> {
Widget build(BuildContext context) {
EasyLoading.instance.loadingStyle = EasyLoadingStyle.light;
return WillPopScope(
onWillPop: () async {
close();
return false;
},
child: FlutterEasyLoading(
child: Scaffold(
backgroundColor: MyTheme.canvasColor,
floatingActionButton: _showBar
? null
: FloatingActionButton(
mini: true,
child: Icon(Icons.expand_less),
backgroundColor: MyTheme.accent50,
onPressed: () {
setState(() => _showBar = !_showBar);
}),
bottomNavigationBar: _showBar && FFI.ffiModel.pi.displays != null
? BottomAppBar(
elevation: 10,
color: MyTheme.accent,
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Row(children: [
IconButton(
onWillPop: () async {
close();
return false;
},
child: Scaffold(
floatingActionButton: _showBar
? null
: FloatingActionButton(
mini: true,
child: Icon(Icons.expand_less),
backgroundColor: MyTheme.accent50,
onPressed: () {
setState(() => _showBar = !_showBar);
}),
bottomNavigationBar: _showBar && FFI.ffiModel.pi.displays != null
? BottomAppBar(
elevation: 10,
color: MyTheme.accent,
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Row(children: [
IconButton(
color: Colors.white,
icon: Icon(Icons.clear),
onPressed: () {
close();
},
),
IconButton(
color: Colors.white,
icon: Icon(Icons.keyboard),
onPressed: openKeyboard),
IconButton(
color: Colors.white,
icon: Icon(Icons.tv),
onPressed: () {
setState(() => _showEdit = false);
showOptions(context);
},
),
Container(
color: _mouseTools ? Colors.blue[500] : null,
child: IconButton(
color: Colors.white,
icon: Icon(Icons.clear),
icon: Icon(Icons.mouse),
onPressed: () {
close();
setState(() {
_mouseTools = !_mouseTools;
resetTool();
});
},
),
IconButton(
color: Colors.white,
icon: Icon(Icons.keyboard),
onPressed: openKeyboard),
IconButton(
color: Colors.white,
icon: Icon(Icons.tv),
onPressed: () {
setState(() => _showEdit = false);
showOptions(context);
},
),
Container(
color: _mouseTools ? Colors.blue[500] : null,
child: IconButton(
color: Colors.white,
icon: Icon(Icons.mouse),
onPressed: () {
setState(() {
_mouseTools = !_mouseTools;
resetTool();
});
},
)),
IconButton(
color: Colors.white,
icon: Icon(Icons.more_vert),
onPressed: () {
setState(() => _showEdit = false);
showActions(context);
},
),
]),
IconButton(
color: Colors.white,
icon: Icon(Icons.expand_more),
onPressed: () {
setState(() => _showBar = !_showBar);
}),
],
),
)
: null,
body: GestureDetector(
)),
IconButton(
color: Colors.white,
icon: Icon(Icons.more_vert),
onPressed: () {
setState(() => _showEdit = false);
showActions(context);
},
),
]),
IconButton(
color: Colors.white,
icon: Icon(Icons.expand_more),
onPressed: () {
setState(() => _showBar = !_showBar);
}),
],
),
)
: null,
body: FlutterEasyLoading(
child: GestureDetector(
onTap: () {
if (_drag || _scroll) return;
FFI.tap(_right);
@ -288,30 +287,32 @@ class _RemotePageState extends State<RemotePage> {
FFI.sendMouse('up', 'left');
}
},
child: Stack(children: [
ImagePaint(),
CursorPaint(),
getHelpTools(),
SizedBox(
width: 0,
height: 0,
child: !_showEdit
? Container()
: TextFormField(
textInputAction: TextInputAction.newline,
autocorrect: false,
enableSuggestions: false,
focusNode: _focusNode,
maxLines: null,
initialValue:
_value, // trick way to make backspace work always
keyboardType: TextInputType.multiline,
onChanged: handleInput,
),
),
]),
)),
));
child: Container(
color: MyTheme.canvasColor,
child: Stack(children: [
ImagePaint(),
CursorPaint(),
getHelpTools(),
SizedBox(
width: 0,
height: 0,
child: !_showEdit
? Container()
: TextFormField(
textInputAction: TextInputAction.newline,
autocorrect: false,
enableSuggestions: false,
focusNode: _focusNode,
maxLines: null,
initialValue:
_value, // trick way to make backspace work always
keyboardType: TextInputType.multiline,
onChanged: handleInput,
),
),
]))),
)),
);
}
void close() {

8
flutter_hbb/pubspec.lock
View File

@ -149,11 +149,9 @@ packages:
flutter_easyloading:
dependency: "direct main"
description:
path: "."
ref: HEAD
resolved-ref: "2d085c411dc262043b6173c3b962d3e66ce657b1"
url: "git://github.com/open-trade/flutter_easyloading"
source: git
path: flutter_easyloading
relative: true
source: path
version: "2.2.0"
flutter_spinkit:
dependency: transitive

6
flutter_hbb/pubspec.yaml
View File

@ -32,9 +32,9 @@ dependencies:
path_provider: ^1.6.24
provider: ^4.3.2+2
flutter_easyloading:
git:
url: git://github.com/open-trade/flutter_easyloading
#path: flutter_easyloading
#git:
#url: git://github.com/open-trade/flutter_easyloading
path: flutter_easyloading
tuple: ^1.0.1
wakelock: ^0.2.1+1
device_info: ^1.0.0