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

flutter_desktop: fix chat message overflow

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2022-08-16 23:07:22 +08:00
parent 82b72e5fdd
commit 213e22e019
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flutter/lib/desktop/pages/remote_page.dart
View File

@ -9,7 +9,6 @@ import 'package:flutter_hbb/models/chat_model.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:wakelock/wakelock.dart'; import 'package:wakelock/wakelock.dart';
import 'package:desktop_multi_window/desktop_multi_window.dart';
// import 'package:window_manager/window_manager.dart'; // import 'package:window_manager/window_manager.dart';

11
flutter/lib/mobile/pages/chat_page.dart
View File

@ -50,17 +50,19 @@ class ChatPage extends StatelessWidget implements PageShape {
final currentUser = chatModel.currentUser; final currentUser = chatModel.currentUser;
return Stack( return Stack(
children: [ children: [
DashChat( LayoutBuilder(builder: (context, constraints) {
return DashChat(
onSend: (chatMsg) { onSend: (chatMsg) {
chatModel.send(chatMsg); chatModel.send(chatMsg);
}, },
currentUser: chatModel.me, currentUser: chatModel.me,
messages: messages: chatModel
chatModel.messages[chatModel.currentID]?.chatMessages ?? .messages[chatModel.currentID]?.chatMessages ??
[], [],
messageOptions: MessageOptions( messageOptions: MessageOptions(
showOtherUsersAvatar: false, showOtherUsersAvatar: false,
showTime: true, showTime: true,
maxWidth: constraints.maxWidth * 0.7,
messageDecorationBuilder: (_, __, ___) => messageDecorationBuilder: (_, __, ___) =>
defaultMessageDecoration( defaultMessageDecoration(
color: MyTheme.accent80, color: MyTheme.accent80,
@ -69,7 +71,8 @@ class ChatPage extends StatelessWidget implements PageShape {
borderBottomRight: 8, borderBottomRight: 8,
borderBottomLeft: 8, borderBottomLeft: 8,
)), )),
), );
}),
chatModel.currentID == ChatModel.clientModeID chatModel.currentID == ChatModel.clientModeID
? SizedBox.shrink() ? SizedBox.shrink()
: Padding( : Padding(

5
flutter/pubspec.yaml
View File

@ -40,7 +40,10 @@ dependencies:
url_launcher: ^6.0.9 url_launcher: ^6.0.9
shared_preferences: ^2.0.6 shared_preferences: ^2.0.6
toggle_switch: ^1.4.0 toggle_switch: ^1.4.0
dash_chat_2: ^0.0.12 dash_chat_2:
git:
url: https://github.com/fufesou/Dash-Chat-2
ref: feat_maxWidth
draggable_float_widget: ^0.0.2 draggable_float_widget: ^0.0.2
settings_ui: ^2.0.2 settings_ui: ^2.0.2
flutter_breadcrumb: ^1.0.1 flutter_breadcrumb: ^1.0.1