optimize dialog margin, fix password eye icon color

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

View File

@ -694,7 +694,6 @@ void msgBox(String id, String type, String title, String text, String link,
buttons.insert(
0, dialogButton('Cancel', onPressed: cancel, isOutline: true));
}
// TODO: test this button
if (type.contains("hasclose")) {
buttons.insert(
0,
@ -708,8 +707,7 @@ void msgBox(String id, String type, String title, String text, String link,
dialogManager.show(
(setState, close) => CustomAlertDialog(
title: null,
content: SelectionArea(
child: msgboxContent(type, title, text).paddingOnly(bottom: 10)),
content: SelectionArea(child: msgboxContent(type, title, text)),
actions: buttons,
onSubmit: hasOk ? submit : 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,
@ -1714,4 +1712,4 @@ Future<void> updateSystemWindowTheme() async {
: SystemWindowTheme.dark);
}
}
}
}

View File

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

View File

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