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

request focus again when android account password obtain focus (#6744)

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-12-24 16:16:47 +08:00 committed by GitHub
parent 9a652e789d
commit 26cebd2aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flutter/lib/common/widgets/dialog.dart
View File

@ -1,4 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@ -411,12 +412,14 @@ class PasswordWidget extends StatefulWidget {
Key? key, Key? key,
required this.controller, required this.controller,
this.autoFocus = true, this.autoFocus = true,
this.reRequestFocus = false,
this.hintText, this.hintText,
this.errorText, this.errorText,
}) : super(key: key); }) : super(key: key);
final TextEditingController controller; final TextEditingController controller;
final bool autoFocus; final bool autoFocus;
final bool reRequestFocus;
final String? hintText; final String? hintText;
final String? errorText; final String? errorText;
@ -428,6 +431,7 @@ class _PasswordWidgetState extends State<PasswordWidget> {
bool _passwordVisible = false; bool _passwordVisible = false;
final _focusNode = FocusNode(); final _focusNode = FocusNode();
Timer? _timer; Timer? _timer;
Timer? _timerReRequestFocus;
@override @override
void initState() { void initState() {
@ -436,11 +440,23 @@ class _PasswordWidgetState extends State<PasswordWidget> {
_timer = _timer =
Timer(Duration(milliseconds: 50), () => _focusNode.requestFocus()); Timer(Duration(milliseconds: 50), () => _focusNode.requestFocus());
} }
// software secure keyboard will take the focus since flutter 3.13
// request focus again when android account password obtain focus
if (Platform.isAndroid && widget.reRequestFocus) {
_focusNode.addListener(() {
if (_focusNode.hasFocus) {
_timerReRequestFocus?.cancel();
_timerReRequestFocus = Timer(
Duration(milliseconds: 100), () => _focusNode.requestFocus());
}
});
}
} }
@override @override
void dispose() { void dispose() {
_timer?.cancel(); _timer?.cancel();
_timerReRequestFocus?.cancel();
_focusNode.unfocus(); _focusNode.unfocus();
_focusNode.dispose(); _focusNode.dispose();
super.dispose(); super.dispose();

1
flutter/lib/common/widgets/login.dart
View File

@ -357,6 +357,7 @@ class LoginWidgetUserPass extends StatelessWidget {
PasswordWidget( PasswordWidget(
controller: pass, controller: pass,
autoFocus: false, autoFocus: false,
reRequestFocus: true,
errorText: passMsg, errorText: passMsg,
), ),
// NOT use Offstage to wrap LinearProgressIndicator // NOT use Offstage to wrap LinearProgressIndicator