From 3e19778deba816539c70a32f81ea295d7c5be770 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Fri, 4 Feb 2022 13:21:13 +0100
Subject: Revert "Prevent ChatTextView from increasing in height after text was
entered"
This reverts commit eefce3fd81d7fcb349acb073941ebf5ca9140507.
The workaround doesn't seem to be necessary anymore.
fixes #1188
---
main/src/ui/chat_input/chat_text_view.vala | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
(limited to 'main/src/ui')
diff --git a/main/src/ui/chat_input/chat_text_view.vala b/main/src/ui/chat_input/chat_text_view.vala
index 928c81ed..2f8393d2 100644
--- a/main/src/ui/chat_input/chat_text_view.vala
+++ b/main/src/ui/chat_input/chat_text_view.vala
@@ -35,9 +35,7 @@ public class ChatTextView : ScrolledWindow {
public signal void send_text();
public signal void cancel_input();
- public TextView text_view = new TextView() { can_focus=true, hexpand=true, wrap_mode=Gtk.WrapMode.WORD_CHAR, valign=Align.CENTER, visible=true };
- // Hack to prevent the ChatTextView from increasing in height after text was entered
- private Label zero_width_label_hack = new Label("") { hexpand=false, valign=Align.CENTER, opacity=0, visible=true };
+ public TextView text_view = new TextView() { can_focus=true, hexpand=true, margin=8, wrap_mode=Gtk.WrapMode.WORD_CHAR, valign=Align.CENTER, visible=true };
private int vscrollbar_min_height;
private SmileyConverter smiley_converter;
public EditHistory edit_history;
@@ -46,10 +44,7 @@ public class ChatTextView : ScrolledWindow {
construct {
max_content_height = 300;
propagate_natural_height = true;
- Box box = new Box(Orientation.HORIZONTAL, 0) { hexpand=true, margin=8, valign=Align.CENTER, visible=true };
- box.add(text_view);
- box.add(zero_width_label_hack);
- this.add(box);
+ this.add(text_view);
smiley_converter = new SmileyConverter(text_view);
edit_history = new EditHistory(text_view);
--
cgit v1.2.3-70-g09d2