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

Merge pull request #3233 from grummbeer/unify-button-show-loading

Browse Source 
Unify buttonstyle, unify dialog padding
This commit is contained in:
RustDesk
2023-02-16 17:38:28 +08:00
committed by GitHub
Unverified
parent 536498f83c b62a05e15f
commit 95ffac5bb9
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flutter/lib/common.dart
View File

@@ -500,12 +500,14 @@ class OverlayDialogManager {
Offstage(
offstage: !showCancel,
child: Center(
child: TextButton(
style: flatButtonStyle,
onPressed: cancel,
child: Text(translate('Cancel'),
style:
const TextStyle(color: MyTheme.accent)))))
child: isDesktop
? dialogButton('Cancel', onPressed: cancel)
: TextButton(
style: flatButtonStyle,
onPressed: cancel,
child: Text(translate('Cancel'),
style: const TextStyle(
color: MyTheme.accent)))))
])),
onCancel: showCancel ? cancel : null,
);
@@ -660,8 +662,8 @@ class CustomAlertDialog extends StatelessWidget {
scrollable: true,
title: title,
titlePadding: EdgeInsets.fromLTRB(padding, 24, padding, 0),
contentPadding: EdgeInsets.fromLTRB(
contentPadding ?? padding, 25, contentPadding ?? padding, 10),
contentPadding: EdgeInsets.fromLTRB(contentPadding ?? padding, 25,
contentPadding ?? padding, actions is List ? 10 : padding),
content: ConstrainedBox(
constraints: contentBoxConstraints,
child: Theme(