mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-29 08:19:05 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

optimize dialog margin, fix password eye icon color

Browse Source
This commit is contained in:
rustdesk 2023-02-05 16:56:13 +08:00
parent 438ff17acb
commit 3462756a11
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/lib/common.dart
View File

@ -694,7 +694,6 @@ void msgBox(String id, String type, String title, String text, String link,
buttons.insert( buttons.insert(
0, dialogButton('Cancel', onPressed: cancel, isOutline: true)); 0, dialogButton('Cancel', onPressed: cancel, isOutline: true));
} }
// TODO: test this button
if (type.contains("hasclose")) { if (type.contains("hasclose")) {
buttons.insert( buttons.insert(
0, 0,
@ -708,8 +707,7 @@ void msgBox(String id, String type, String title, String text, String link,
dialogManager.show( dialogManager.show(
(setState, close) => CustomAlertDialog( (setState, close) => CustomAlertDialog(
title: null, title: null,
content: SelectionArea( content: SelectionArea(child: msgboxContent(type, title, text)),
child: msgboxContent(type, title, text).paddingOnly(bottom: 10)),
actions: buttons, actions: buttons,
onSubmit: hasOk ? submit : null, onSubmit: hasOk ? submit : null,
onCancel: hasCancel == true ? cancel : null, onCancel: hasCancel == true ? cancel : null,
@ -774,7 +772,7 @@ Widget msgboxContent(String type, String title, String text) {
), ),
), ),
], ],
); ).marginOnly(bottom: 12);
} }
void msgBoxCommon(OverlayDialogManager dialogManager, String title, void msgBoxCommon(OverlayDialogManager dialogManager, String title,

1
flutter/lib/consts.dart
View File

@ -26,7 +26,6 @@ const String kWindowEventShow = "show";
const String kWindowConnect = "connect"; const String kWindowConnect = "connect";
const String kUniLinksPrefix = "rustdesk://"; const String kUniLinksPrefix = "rustdesk://";
const String kActionNewConnection = "connection/new/";
const String kTabLabelHomePage = "Home"; const String kTabLabelHomePage = "Home";
const String kTabLabelSettingPage = "Settings"; const String kTabLabelSettingPage = "Settings";

5
flutter/lib/mobile/widgets/dialog.dart
View File

@ -1,7 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hbb/desktop/widgets/button.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import '../../common.dart'; import '../../common.dart';
@ -371,8 +370,7 @@ void showWaitUacDialog(
tag: '$id-wait-uac', tag: '$id-wait-uac',
(setState, close) => CustomAlertDialog( (setState, close) => CustomAlertDialog(
title: null, title: null,
content: msgboxContent(type, 'Wait', 'wait_accept_uac_tip') content: msgboxContent(type, 'Wait', 'wait_accept_uac_tip'),
.marginOnly(bottom: 10),
)); ));
} }
@ -647,7 +645,6 @@ class _PasswordWidgetState extends State<PasswordWidget> {
icon: Icon( icon: Icon(
// Based on passwordVisible state choose the icon // Based on passwordVisible state choose the icon
_passwordVisible ? Icons.visibility : Icons.visibility_off, _passwordVisible ? Icons.visibility : Icons.visibility_off,
color: Theme.of(context).primaryColorDark,
), ),
onPressed: () { onPressed: () {
// Update the state i.e. toggle the state of passwordVisible variable // Update the state i.e. toggle the state of passwordVisible variable