mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-06-11 04:33:08 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

send when left shift key is not pressed

Browse Source
This commit is contained in:
NicKoehler 2023-06-08 16:00:48 +02:00
parent 92fada0c8e
commit c9ce5233f5
No known key found for this signature in database
GPG Key ID: 0EC502B679A11DD1
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,16 +54,14 @@ class ChatPage extends StatelessWidget implements PageShape {
children: [ children: [
LayoutBuilder(builder: (context, constraints) { LayoutBuilder(builder: (context, constraints) {
final chat = DashChat( final chat = DashChat(
onSend: (chatMsg) { onSend: chatModel.send,
chatModel.send(chatMsg);
chatModel.inputNode.requestFocus();
},
currentUser: chatModel.me, currentUser: chatModel.me,
messages: messages:
chatModel.messages[chatModel.currentID]?.chatMessages ?? chatModel.messages[chatModel.currentID]?.chatMessages ??
[], [],
inputOptions: InputOptions( inputOptions: InputOptions(
focusNode: chatModel.inputNode, focusNode: chatModel.inputNode,
textController: chatModel.textController,
inputTextStyle: TextStyle( inputTextStyle: TextStyle(
fontSize: 14, fontSize: 14,
color: Theme.of(context).textTheme.titleLarge?.color), color: Theme.of(context).textTheme.titleLarge?.color),

38
flutter/lib/models/chat_model.dart
View File

@ -3,6 +3,7 @@ import 'dart:async';
import 'package:dash_chat_2/dash_chat_2.dart'; import 'package:dash_chat_2/dash_chat_2.dart';
import 'package:draggable_float_widget/draggable_float_widget.dart'; import 'package:draggable_float_widget/draggable_float_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hbb/models/platform_model.dart'; import 'package:flutter_hbb/models/platform_model.dart';
import 'package:get/get_rx/src/rx_types/rx_types.dart'; import 'package:get/get_rx/src/rx_types/rx_types.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -42,6 +43,14 @@ class ChatModel with ChangeNotifier {
Rx<VoiceCallStatus> get voiceCallStatus => _voiceCallStatus; Rx<VoiceCallStatus> get voiceCallStatus => _voiceCallStatus;
TextEditingController textController = TextEditingController();
@override
void dispose() {
textController.dispose();
super.dispose();
}
final ChatUser me = ChatUser( final ChatUser me = ChatUser(
id: "", id: "",
firstName: translate("Me"), firstName: translate("Me"),
@ -75,12 +84,36 @@ class ChatModel with ChangeNotifier {
final WeakReference<FFI> parent; final WeakReference<FFI> parent;
late final SessionID sessionId; late final SessionID sessionId;
late FocusNode inputNode;
ChatModel(this.parent) { ChatModel(this.parent) {
sessionId = parent.target!.sessionId; sessionId = parent.target!.sessionId;
} inputNode = FocusNode(
onKey: (node, event) {
bool isShiftPressed = event.isKeyPressed(LogicalKeyboardKey.shiftLeft);
bool isEnterPressed = event.isKeyPressed(LogicalKeyboardKey.enter);
FocusNode inputNode = FocusNode(); String trimmedText = textController.text.trim();
// don't send empty message
if (trimmedText.isEmpty) {
textController.text = trimmedText;
}
if (isEnterPressed && !isShiftPressed) {
final ChatMessage message = ChatMessage(
text: trimmedText,
user: me,
createdAt: DateTime.now(),
);
send(message);
textController.text = "";
}
return KeyEventResult.ignored;
},
);
}
ChatUser get currentUser { ChatUser get currentUser {
final user = messages[currentID]?.chatUser; final user = messages[currentID]?.chatUser;
@ -313,6 +346,7 @@ class ChatModel with ChangeNotifier {
} }
} }
notifyListeners(); notifyListeners();
inputNode.requestFocus();
} }
close() { close() {