aboutsummaryrefslogtreecommitdiff
path: root/main/src/ui/chat_input/chat_text_view.vala
diff options
context:
space:
mode:
authorXavier Del Campo Romero <xavi.dcr@tutanota.com>2023-09-18 23:15:06 +0200
committerXavier Del Campo Romero <xavi.dcr@tutanota.com>2023-10-09 14:08:59 +0200
commit2f1f04b3e80beaf2c7f333a14cb7e14eeafe935e (patch)
tree8595300e969dc7510804ea26e7d15d2d2e5ea7b7 /main/src/ui/chat_input/chat_text_view.vala
parentbe7e0c2d5689d962fd2424e60ed21062d0674e95 (diff)
downloaddino-2f1f04b3e80beaf2c7f333a14cb7e14eeafe935e.tar.gz
Make send button settings-selectable
Diffstat (limited to 'main/src/ui/chat_input/chat_text_view.vala')
-rw-r--r--main/src/ui/chat_input/chat_text_view.vala7
1 files changed, 5 insertions, 2 deletions
diff --git a/main/src/ui/chat_input/chat_text_view.vala b/main/src/ui/chat_input/chat_text_view.vala
index 6b85b082..0bfb41a9 100644
--- a/main/src/ui/chat_input/chat_text_view.vala
+++ b/main/src/ui/chat_input/chat_text_view.vala
@@ -76,8 +76,11 @@ public class ChatTextView : ScrolledWindow {
private bool on_text_input_key_press(EventKey event) {
if (event.keyval in new uint[]{Key.Return, Key.KP_Enter}) {
- if ((event.state & ModifierType.CONTROL_MASK) > 0) {
- text_view.buffer.insert_at_cursor("\n", 1);
+ Dino.Entities.Settings settings = Dino.Application.get_default().settings;
+
+ if ((event.state & ModifierType.SHIFT_MASK) > 0
+ || settings.enter_newline) {
+ text_view.buffer.insert_at_cursor("\n", 1);
} else if (text_view.buffer.text.strip() != "") {
send_text();
edit_history.reset_history();