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

partially fix issue #2747: text selectable, more top margin of buttons

Browse Source 
on dialog
This commit is contained in:
rustdesk 2023-02-01 21:28:26 +08:00
parent fdfda2a982
commit 68cc667f47
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flutter/lib/common.dart
View File

@ -707,7 +707,8 @@ 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: msgboxContent(type, title, text), content: SelectionArea(
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,

3
flutter/lib/common/widgets/chat_page.dart
View File

@ -51,7 +51,7 @@ class ChatPage extends StatelessWidget implements PageShape {
return Stack( return Stack(
children: [ children: [
LayoutBuilder(builder: (context, constraints) { LayoutBuilder(builder: (context, constraints) {
return DashChat( final chat = DashChat(
onSend: (chatMsg) { onSend: (chatMsg) {
chatModel.send(chatMsg); chatModel.send(chatMsg);
chatModel.inputNode.requestFocus(); chatModel.inputNode.requestFocus();
@ -108,6 +108,7 @@ class ChatPage extends StatelessWidget implements PageShape {
borderBottomLeft: 8, borderBottomLeft: 8,
)), )),
); );
return SelectionArea(child: chat);
}), }),
desktopType == DesktopType.cm || desktopType == DesktopType.cm ||
chatModel.currentID == ChatModel.clientModeID chatModel.currentID == ChatModel.clientModeID

13
flutter/lib/desktop/pages/desktop_setting_page.dart
View File

@ -1113,10 +1113,12 @@ class _AboutState extends State<_About> {
const SizedBox( const SizedBox(
height: 8.0, height: 8.0,
), ),
Text('${translate('Version')}: $version') SelectionArea(
.marginSymmetric(vertical: 4.0), child: Text('${translate('Version')}: $version')
Text('${translate('Build Date')}: $buildDate') .marginSymmetric(vertical: 4.0)),
.marginSymmetric(vertical: 4.0), SelectionArea(
child: Text('${translate('Build Date')}: $buildDate')
.marginSymmetric(vertical: 4.0)),
InkWell( InkWell(
onTap: () { onTap: () {
launchUrlString('https://rustdesk.com/privacy'); launchUrlString('https://rustdesk.com/privacy');
@ -1137,6 +1139,7 @@ class _AboutState extends State<_About> {
decoration: const BoxDecoration(color: Color(0xFF2c8cff)), decoration: const BoxDecoration(color: Color(0xFF2c8cff)),
padding: padding:
const EdgeInsets.symmetric(vertical: 24, horizontal: 8), const EdgeInsets.symmetric(vertical: 24, horizontal: 8),
child: SelectionArea(
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
@ -1157,7 +1160,7 @@ class _AboutState extends State<_About> {
), ),
), ),
], ],
), )),
).marginSymmetric(vertical: 4.0) ).marginSymmetric(vertical: 4.0)
], ],
).marginOnly(left: _kContentHMargin) ).marginOnly(left: _kContentHMargin)