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

Merge pull request #2714 from fufesou/fix/Portuguese_Brazil_accents

Browse Source 
try fix accets on Portuguese (Brazil)
This commit is contained in:
RustDesk 2023-01-04 16:55:41 +08:00 committed by GitHub
commit fec4e3a049
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -4304,7 +4304,7 @@ dependencies = [
[[package]] [[package]]
name = "rdev" name = "rdev"
version = "0.5.0-2" version = "0.5.0-2"
source = "git+https://github.com/fufesou/rdev#196b589573f90703a601e6b105dd7c917fc388f9" source = "git+https://github.com/fufesou/rdev#916e8db3e68dbc0fe95b158c566374b159b9cba8"
dependencies = [ dependencies = [
"cocoa", "cocoa",
"core-foundation 0.9.3", "core-foundation 0.9.3",

14
flutter/lib/desktop/widgets/login.dart
View File

@ -107,7 +107,7 @@ class WidgetOP extends StatefulWidget {
class _WidgetOPState extends State<WidgetOP> { class _WidgetOPState extends State<WidgetOP> {
Timer? _updateTimer; Timer? _updateTimer;
String _stateMsg = ''; String _stateMsg = '';
String _FailedMsg = ''; String _failedMsg = '';
String _url = ''; String _url = '';
@override @override
@ -140,7 +140,7 @@ class _WidgetOPState extends State<WidgetOP> {
String failedMsg = resultMap['failed_msg']; String failedMsg = resultMap['failed_msg'];
final String? url = resultMap['url']; final String? url = resultMap['url'];
final authBody = resultMap['auth_body']; final authBody = resultMap['auth_body'];
if (_stateMsg != stateMsg || _FailedMsg != failedMsg) { if (_stateMsg != stateMsg || _failedMsg != failedMsg) {
if (_url.isEmpty && url != null && url.isNotEmpty) { if (_url.isEmpty && url != null && url.isNotEmpty) {
launchUrl(Uri.parse(url)); launchUrl(Uri.parse(url));
_url = url; _url = url;
@ -154,7 +154,7 @@ class _WidgetOPState extends State<WidgetOP> {
setState(() { setState(() {
_stateMsg = stateMsg; _stateMsg = stateMsg;
_FailedMsg = failedMsg; _failedMsg = failedMsg;
if (failedMsg.isNotEmpty) { if (failedMsg.isNotEmpty) {
widget.curOP.value = ''; widget.curOP.value = '';
_updateTimer?.cancel(); _updateTimer?.cancel();
@ -166,7 +166,7 @@ class _WidgetOPState extends State<WidgetOP> {
_resetState() { _resetState() {
_stateMsg = ''; _stateMsg = '';
_FailedMsg = ''; _failedMsg = '';
_url = ''; _url = '';
} }
@ -190,11 +190,11 @@ class _WidgetOPState extends State<WidgetOP> {
Obx(() { Obx(() {
if (widget.curOP.isNotEmpty && if (widget.curOP.isNotEmpty &&
widget.curOP.value != widget.config.op) { widget.curOP.value != widget.config.op) {
_FailedMsg = ''; _failedMsg = '';
} }
return Offstage( return Offstage(
offstage: offstage:
_FailedMsg.isEmpty && widget.curOP.value != widget.config.op, _failedMsg.isEmpty && widget.curOP.value != widget.config.op,
child: Row( child: Row(
children: [ children: [
Text( Text(
@ -203,7 +203,7 @@ class _WidgetOPState extends State<WidgetOP> {
), ),
SizedBox(width: 8), SizedBox(width: 8),
Text( Text(
_FailedMsg, _failedMsg,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Colors.red, color: Colors.red,

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

@ -1410,10 +1410,10 @@ class _DraggableShowHide extends StatefulWidget {
}) : super(key: key); }) : super(key: key);
@override @override
State<_DraggableShowHide> createState() => __DraggableShowHideState(); State<_DraggableShowHide> createState() => _DraggableShowHideState();
} }
class __DraggableShowHideState extends State<_DraggableShowHide> { class _DraggableShowHideState extends State<_DraggableShowHide> {
Offset position = Offset.zero; Offset position = Offset.zero;
Size size = Size.zero; Size size = Size.zero;